From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 22 Jun 2011 11:28:20 +0200
Subject: update to MediaWiki 1.17.0

---
 maintenance/fetchText.php | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

(limited to 'maintenance/fetchText.php')

diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php
index 746ef8ad..ea56535d 100644
--- a/maintenance/fetchText.php
+++ b/maintenance/fetchText.php
@@ -20,7 +20,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class FetchText extends Maintenance {
 	public function __construct() {
@@ -28,35 +28,52 @@ class FetchText extends Maintenance {
 		$this->mDescription = "Fetch the revision text from an old_id";
 	}
 
-	public function execute() {
+	/*
+	 * returns a string containing the following in order:
+	 *	 textid
+	 *	 \n
+	 *	 length of text (-1 on error = failure to retrieve/unserialize/gunzip/etc)
+	 *	 \n
+	 *	 text  (may be empty)
+	 *
+	 * note that that the text string itself is *not* followed by newline
+	 */
+	 public function execute() {
 		$db = wfGetDB( DB_SLAVE );
 		$stdin = $this->getStdin();
-		while( !feof( $stdin ) ) {
+		while ( !feof( $stdin ) ) {
 			$line = fgets( $stdin );
-			if( $line === false ) {
+			if ( $line === false ) {
 				// We appear to have lost contact...
 				break;
 			}
 			$textId = intval( $line );
 			$text = $this->doGetText( $db, $textId );
-			$this->output( strlen( $text ) . "\n". $text );
+			if ($text === false) {
+				# actual error, not zero-length text
+				$textLen = "-1";
+			}
+			else {
+				$textLen = strlen($text);
+			}
+			$this->output( $textId . "\n" . $textLen . "\n" . $text );
 		}
 	}
-	
+
 	/**
- 	 * May throw a database error if, say, the server dies during query.
+	 * May throw a database error if, say, the server dies during query.
 	 * @param $db Database object
 	 * @param $id int The old_id
 	 * @return String
- 	 */
+	 */
 	private function doGetText( $db, $id ) {
 		$id = intval( $id );
 		$row = $db->selectRow( 'text',
 			array( 'old_text', 'old_flags' ),
 			array( 'old_id' => $id ),
-			'TextPassDumper::getText' );
+			__METHOD__ );
 		$text = Revision::getRevisionText( $row );
-		if( $text === false ) {
+		if ( $text === false ) {
 			return false;
 		}
 		return $text;
@@ -64,4 +81,4 @@ class FetchText extends Maintenance {
 }
 
 $maintClass = "FetchText";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
-- 
cgit v1.2.3-54-g00ecf