X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FfetchText.php;h=3b43bcd503cb781d852f80a53f742779000e5e20;hb=0e18ea727d31f5f513e54f8e3d8bd45259c16378;hp=809a1f26709a3aaaa4cdf67674d6e439e845e291;hpb=659778619cc12d156d3547834c0f90f407584104;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php
index 809a1f2670..3b43bcd503 100644
--- a/maintenance/fetchText.php
+++ b/maintenance/fetchText.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Communications protocol...
+ * This is used by dumpTextPass.php when the --spawn option is present.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +29,17 @@ 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 ) ) {
@@ -39,22 +50,29 @@ class FetchText extends Maintenance {
 			}
 			$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.
-	 * @param $db Database object
+	 * May throw a database error if, say, the server dies during query.
+	 * @param $db DatabaseBase 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 ) {
 			return false;
@@ -64,4 +82,4 @@ class FetchText extends Maintenance {
 }
 
 $maintClass = "FetchText";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );