remove accidentally left-in debugging output

[lhc/web/wiklou.git] / maintenance / archives / convertdb.php

diff --git a/maintenance/archives/convertdb.php b/maintenance/archives/convertdb.php
index b7070f4..3950fab 100644 (file)
--- a/maintenance/archives/convertdb.php
+++ b/maintenance/archives/convertdb.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 print "This script is obsolete!";
 print "It is retained in the source here in case some of its
@@ -11,14 +11,14 @@ exit();
 # dump files.
 
 global $IP;
-include_once( "../LocalSettings.php" );
-include_once( "../AdminSettings.php" );
-include_once( "$IP/Setup.php" );
+require_once( "../LocalSettings.php" );
+require_once( "../AdminSettings.php" );
+require_once( "$IP/Setup.php" );
 
 $wgTitle = Title::newFromText( "Conversion script" );
-include_once( "./rebuildLinks.inc" );
-include_once( "./rebuildRecentchanges.inc" );
-include_once( "./buildTables.inc" );
+require_once( "./rebuildLinks.inc" );
+require_once( "./rebuildRecentchanges.inc" );
+require_once( "./buildTables.inc" );
 set_time_limit(0);
 
 $wgDBuser                      = "wikiadmin";
@@ -63,14 +63,14 @@ function convertUserTable()
        print "Converting USER table.\n";
 
        $sql = "LOCK TABLES old_user READ, user WRITE";
-       $newres = wfQuery( $sql, DB_WRITE );
+       $newres = wfQuery( $sql, DB_MASTER );
 
        $sql = "SELECT user_id,user_name,user_rights,user_password," .
          "user_email,user_options,user_watch FROM old_user";
-       $oldres = wfQuery( $sql, DB_READ );
+       $oldres = wfQuery( $sql, DB_SLAVE );
 
        $sql = "DELETE FROM user";
-       $newres = wfQuery( $sql, DB_WRITE );
+       $newres = wfQuery( $sql, DB_MASTER );
 
        $sql = "";
        while ( $row = mysql_fetch_object( $oldres ) ) {
@@ -78,7 +78,7 @@ function convertUserTable()
                if ( "" == $name ) continue; # Don't convert illegal names
 
                if ( 0 == ( $count % 10 ) ) {
-                       if ( 0 != $count ) { $newres = wfQuery( $sql, DB_WRITE ); }
+                       if ( 0 != $count ) { $newres = wfQuery( $sql, DB_MASTER ); }
 
                        $sql = "INSERT INTO user (user_id,user_name,user_rights," .
                          "user_password,user_newpassword,user_email,user_options," .
@@ -99,13 +99,13 @@ function convertUserTable()
                        print "$count user records processed.\n";
                }
        }
-       if ( $sql ) { $newres = wfQuery( $sql, DB_WRITE ); }
+       if ( $sql ) { $newres = wfQuery( $sql, DB_MASTER ); }
 
        print "$count user records processed.\n";
        mysql_free_result( $oldres );
 
        $sql = "UNLOCK TABLES";
-       $newres = wfQuery( $sql, DB_WRITE );
+       $newres = wfQuery( $sql, DB_MASTER );
 }
 
 # Convert May 2002 version of database into new format.
@@ -116,18 +116,18 @@ function convertCurTable()
        print "Converting CUR table.\n";
 
        $sql = "LOCK TABLES old_cur READ, cur WRITE, site_stats WRITE";
-       $newres = wfQuery( $sql, DB_WRITE );
+       $newres = wfQuery( $sql, DB_MASTER );
 
        $sql = "SELECT cur_id,cur_title,cur_text,cur_comment,cur_user," .
          "cur_timestamp,cur_minor_edit,cur_restrictions," .
          "cur_counter,cur_ind_title,cur_user_text FROM old_cur";
-       $oldres = wfQuery( $sql, DB_READ );
+       $oldres = wfQuery( $sql, DB_SLAVE );
 
        $sql = "DELETE FROM cur";
-       wfQuery( $sql, DB_WRITE );
+       wfQuery( $sql, DB_MASTER );
 
        $sql = "DELETE FROM site_stats";
-       wfQuery( $sql, DB_WRITE );
+       wfQuery( $sql, DB_MASTER );
 
        $sql = "";
        while ( $row = mysql_fetch_object( $oldres ) ) {
@@ -166,7 +166,7 @@ function convertCurTable()
                  "'{$com}',{$row->cur_user},'{$row->cur_timestamp}'," .
                  "{$isme},{$isnew},'{$cr}',0,'{$ititle}','{$itext}'," .
                  "{$redir},'{$cut}')";
-               wfQuery( $sql, DB_WRITE );
+               wfQuery( $sql, DB_MASTER );
 
                if ( ( ++$count % 1000 ) == 0 ) {
                        print "$count article records processed.\n";
@@ -181,10 +181,10 @@ function convertCurTable()
 
        $sql = "REPLACE INTO site_stats (ss_row_id,ss_total_views," .
          "ss_total_edits,ss_good_articles) VALUES (1,0,0,{$countables})";
-       wfQuery( $sql, DB_WRITE );
+       wfQuery( $sql, DB_MASTER );
 
        $sql = "UNLOCK TABLES";
-       $newres = wfQuery( $sql, DB_WRITE );
+       $newres = wfQuery( $sql, DB_MASTER );
 }
 
 # Convert May 2002 version of database into new format.
@@ -195,14 +195,14 @@ function convertOldTable()
        print "Converting OLD table.\n";
 
        $sql = "LOCK TABLES old_old READ, old WRITE";
-       $newres = wfQuery( $sql, DB_WRITE );
+       $newres = wfQuery( $sql, DB_MASTER );
 
        $sql = "SELECT old_id,old_title,old_text,old_comment,old_user," .
          "old_timestamp,old_minor_edit,old_user_text FROM old_old";
-       $oldres = wfQuery( $sql, DB_READ );
+       $oldres = wfQuery( $sql, DB_SLAVE );
 
        $sql = "DELETE FROM old";
-       $newres = wfQuery( $sql, DB_WRITE );
+       $newres = wfQuery( $sql, DB_MASTER );
 
        while ( $row = mysql_fetch_object( $oldres ) ) {
                $nt = Title::newFromDBkey( $row->old_title );
@@ -231,7 +231,7 @@ function convertOldTable()
                $sql .= "({$row->old_id},{$ns},'{$title}','{$text}'," .
                  "'{$com}',{$row->old_user},'{$row->old_timestamp}'," .
                  "{$isme},'{$cut}')";
-               wfQuery( $sql, DB_WRITE );
+               wfQuery( $sql, DB_MASTER );
 
                if ( ( ++$count % 1000 ) == 0 ) {
                        print "$count history records processed.\n";
@@ -241,7 +241,7 @@ function convertOldTable()
        mysql_free_result( $oldres );
 
        $sql = "UNLOCK TABLES";
-       $newres = wfQuery( $sql, DB_WRITE );
+       $newres = wfQuery( $sql, DB_MASTER );
 }
 
 function convertImageDirectoriesX()
@@ -284,14 +284,14 @@ function convertImageDirectoriesX()
 
                        $sql = "DELETE FROM image WHERE img_name='" .
                          addslashes( $nname ) . "'";
-                       $res = wfQuery( $sql, DB_WRITE );
+                       $res = wfQuery( $sql, DB_MASTER );
 
                        $sql = "INSERT INTO image (img_name,img_timestamp,img_user," .
                          "img_user_text,img_size,img_description) VALUES ('" .
                          addslashes( $nname ) . "','" .
                          date( "YmdHis" ) . "',0,'(Automated conversion)','" .
                          filesize( "{$dest}/{$nname}" ) . "','')";
-                       $res = wfQuery( $sql, DB_WRITE );
+                       $res = wfQuery( $sql, DB_MASTER );
                } else {
                        die( "Couldn't copy \"{$oname}\" to \"{$nname}\"\n" );
                }
@@ -306,7 +306,7 @@ function convertImageDirectories()
 
 
        $sql = "SELECT DISTINCT il_to FROM imagelinks";
-       $result = wfQuery ( $sql, DB_READ ) ;
+       $result = wfQuery ( $sql, DB_SLAVE ) ;
 
    while ( $row = mysql_fetch_object ( $result ) ) {
        $oname = $row->il_to ;
@@ -347,14 +347,14 @@ function convertImageDirectories()
 
                        $sql = "DELETE FROM image WHERE img_name='" .
                          addslashes( $nname ) . "'";
-                       $res = wfQuery( $sql, DB_WRITE );
+                       $res = wfQuery( $sql, DB_MASTER );
 
                        $sql = "INSERT INTO image (img_name,img_timestamp,img_user," .
                          "img_user_text,img_size,img_description) VALUES ('" .
                          addslashes( $nname ) . "','" .
                          date( "YmdHis" ) . "',0,'(Automated conversion)','" .
                          filesize( "{$dest}/{$nname}" ) . "','')";
-                       $res = wfQuery( $sql, DB_WRITE );
+                       $res = wfQuery( $sql, DB_MASTER );
                } else {
             echo( "Couldn't copy \"{$oname}\" to \"{$nname}\"\n" );
         }
@@ -557,36 +557,36 @@ function refillRandom()
        $sql = "INSERT INTO random(ra_current,ra_title) SELECT 0,cur_title " .
          "FROM cur WHERE cur_namespace=0 AND cur_is_redirect=0 " .
          "ORDER BY RAND() LIMIT 1000";
-       wfQuery( $sql, DB_WRITE, $fname );
+       wfQuery( $sql, DB_MASTER, $fname );
 
        $sql = "UPDATE random SET ra_current=(ra_current+1)";
-       wfQuery( $sql, DB_WRITE, $fname );
+       wfQuery( $sql, DB_MASTER, $fname );
 
        $sql = "DELETE FROM random WHERE ra_current>1";
-       wfQuery( $sql, DB_WRITE, $fname );
+       wfQuery( $sql, DB_MASTER, $fname );
 }
 
 function renameOldTables()
 {
        $sql = "ALTER TABLE user RENAME TO old_user";
-       wfQuery( $sql, DB_WRITE );
+       wfQuery( $sql, DB_MASTER );
        $sql = "ALTER TABLE cur RENAME TO old_cur";
-       wfQuery( $sql, DB_WRITE );
+       wfQuery( $sql, DB_MASTER );
        $sql = "ALTER TABLE old RENAME TO old_old";
-       wfQuery( $sql, DB_WRITE );
+       wfQuery( $sql, DB_MASTER );
        $sql = "DROP TABLE IF EXISTS linked";
-       wfQuery( $sql, DB_WRITE );
+       wfQuery( $sql, DB_MASTER );
        $sql = "DROP TABLE IF EXISTS unlinked";
-       wfQuery( $sql, DB_WRITE );
+       wfQuery( $sql, DB_MASTER );
 }
 
 function removeOldTables()
 {
-       wfQuery( "DROP TABLE IF EXISTS old_user", DB_WRITE );
-       wfQuery( "DROP TABLE IF EXISTS old_linked", DB_WRITE );
-       wfQuery( "DROP TABLE IF EXISTS old_unlinked", DB_WRITE );
-       wfQuery( "DROP TABLE IF EXISTS old_cur", DB_WRITE );
-       wfQuery( "DROP TABLE IF EXISTS old_old", DB_WRITE );
+       wfQuery( "DROP TABLE IF EXISTS old_user", DB_MASTER );
+       wfQuery( "DROP TABLE IF EXISTS old_linked", DB_MASTER );
+       wfQuery( "DROP TABLE IF EXISTS old_unlinked", DB_MASTER );
+       wfQuery( "DROP TABLE IF EXISTS old_cur", DB_MASTER );
+       wfQuery( "DROP TABLE IF EXISTS old_old", DB_MASTER );
 }
 
 ?>