* Big update for Danish messages.

[lhc/web/wiklou.git] / maintenance / namespaceDupes.php

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 1e995b0..c5c1ec5 100644 (file)
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
 $options = array( 'fix', 'suffix', 'help' );
@@ -27,7 +27,7 @@ if(isset( $options['help'] ) ) {
 print <<<END
 usage: namespaceDupes.php [--fix] [--suffix=<text>] [--help]
     --help          : this help message
-    --fix           : attempt to automaticly fix errors
+    --fix           : attempt to automatically fix errors
     --suffix=<text> : dupes will be renamed with correct namespace with <text>
                       appended after the article name.
 
@@ -75,6 +75,14 @@ class NamespaceConflictChecker {
                }
                return $ok;
        }
+       
+       /**
+        * @fixme: do this for reals
+        */
+       function checkPrefix( $key, $prefix, $fix, $suffix = '' ) {
+               echo "Checking prefix \"$prefix\" vs namespace $key\n";
+               return $this->checkNamespace( $key, $prefix, $fix, $suffix );
+       }
 
        function getConflicts( $ns, $name ) {
                $page  = $this->newSchema() ? 'page' : 'cur';
@@ -103,12 +111,12 @@ class NamespaceConflictChecker {
        }
 
        function reportConflict( $row, $suffix ) {
-               $newTitle = Title::makeTitle( $row->namespace, $row->title );
+               $newTitle = Title::makeTitleSafe( $row->namespace, $row->title );
                printf( "... %d (0,\"%s\") -> (%d,\"%s\") [[%s]]\n",
                        $row->id,
                        $row->oldtitle,
-                       $row->namespace,
-                       $row->title,
+                       $newTitle->getNamespace(),
+                       $newTitle->getDbKey(),
                        $newTitle->getPrefixedText() );
 
                $id = $newTitle->getArticleId();
@@ -123,7 +131,7 @@ class NamespaceConflictChecker {
        function resolveConflict( $row, $resolvable, $suffix ) {
                if( !$resolvable ) {
                        $row->title .= $suffix;
-                       $title = Title::makeTitle( $row->namespace, $row->title );
+                       $title = Title::makeTitleSafe( $row->namespace, $row->title );
                        echo "...  *** using suffixed form [[" . $title->getPrefixedText() . "]] ***\n";
                }
                $tables = $this->newSchema()
@@ -138,10 +146,11 @@ class NamespaceConflictChecker {
        function resolveConflictOn( $row, $table ) {
                $fname = 'NamespaceConflictChecker::resolveConflictOn';
                echo "... resolving on $table... ";
+               $newTitle = Title::makeTitleSafe( $row->namespace, $row->title );
                $this->db->update( $table,
                        array(
-                               "{$table}_namespace" => $row->namespace,
-                               "{$table}_title"     => $row->title,
+                               "{$table}_namespace" => $newTitle->getNamespace(),
+                               "{$table}_title"     => $newTitle->getDbKey(),
                        ),
                        array(
                                "{$table}_namespace" => 0,
@@ -164,9 +173,16 @@ $wgTitle = Title::newFromText( 'Namespace title conflict cleanup script' );
 
 $fix = isset( $options['fix'] );
 $suffix = isset( $options['suffix'] ) ? $options['suffix'] : '';
-$dbw =& wfGetDB( DB_MASTER );
+$prefix = isset( $options['prefix'] ) ? $options['prefix'] : '';
+$key = isset( $options['key'] ) ? intval( $options['key'] ) : 0;
+$dbw = wfGetDB( DB_MASTER );
 $duper = new NamespaceConflictChecker( $dbw );
-$retval = $duper->checkAll( $fix, $suffix );
+
+if( $prefix ) {
+       $retval = $duper->checkPrefix( $key, $prefix, $fix, $suffix );
+} else {
+       $retval = $duper->checkAll( $fix, $suffix );
+}
 
 if( $retval ) {
        echo "\nLooks good!\n";