X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FpopulateLogSearch.inc;h=b5e34fb78b3575df0bc1da356357feb99dc5ee11;hb=54e82bed2bc68a665e49fb63a38e605b871ebb22;hp=1f0a2bb85832516707e4df83f147519b655d2a26;hpb=2aee9e3b16a1e416a194d6d4aba3c8940776dc6b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/populateLogSearch.inc b/maintenance/populateLogSearch.inc
index 1f0a2bb858..b5e34fb78b 100644
--- a/maintenance/populateLogSearch.inc
+++ b/maintenance/populateLogSearch.inc
@@ -1,9 +1,6 @@
 <?php
 /**
- * Makes the required database updates for Special:ProtectedPages
- * to show all protected pages, even ones before the page restrictions
- * schema change. All remaining page_restriction column values are moved
- * to the new table.
+ * Makes the required database updates for log display in Special:RevisionDelete
  *
  * Run via update.php or directly through populateLogSearch.php
  *
@@ -11,12 +8,13 @@
  * @ingroup Maintenance
  */
 
-define( 'LOG_SEARCH_BATCH_SIZE', 100 );
+define( 'LOG_SEARCH_BATCH_SIZE', 300 );
 
 function migrate_log_params( $db ) {
 	$start = $db->selectField( 'logging', 'MIN(log_id)', false, __FUNCTION__ );
 	if( !$start ) {
-		die("Nothing to do.\n");
+		echo "Nothing to do.\n";
+		return true;
 	}
 	$end = $db->selectField( 'logging', 'MAX(log_id)', false, __FUNCTION__ );
 	
@@ -26,7 +24,9 @@ function migrate_log_params( $db ) {
 	$blockEnd = $start + LOG_SEARCH_BATCH_SIZE - 1;
 	while( $blockEnd <= $end ) {
 		echo "...doing log_id from $blockStart to $blockEnd\n";
-		$cond = "log_id BETWEEN $blockStart AND $blockEnd";
+		$cond = array("log_id BETWEEN $blockStart AND $blockEnd");
+		# Applicable log types
+		$cond['log_type'] = array('delete','suppress');
 		$res = $db->select( 'logging', '*', $cond, __FUNCTION__ );
 		$batch = array();
 		while( $row = $db->fetchObject( $res ) ) {
@@ -42,7 +42,7 @@ function migrate_log_params( $db ) {
 						$field = RevisionDeleter::getRelationType($params[0]);
 					}
 					if( $field == null ) {
-						echo "Invalid param type for $row->log_id";
+						echo "Invalid param type for $row->log_id\n";
 						continue; // skip this row
 					}
 					$items = explode(',',$params[1]);
@@ -60,8 +60,8 @@ function migrate_log_params( $db ) {
 				}
 			}
 		}
-		$blockStart += LOG_SEARCH_BATCH_SIZE - 1;
-		$blockEnd += LOG_SEARCH_BATCH_SIZE - 1;
+		$blockStart += LOG_SEARCH_BATCH_SIZE;
+		$blockEnd += LOG_SEARCH_BATCH_SIZE;
 		wfWaitForSlaves( 5 );
 	}
 	if( $db->insert(