distinguish failed text retrieval from empty text, consolidate text retrieval retry...

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

diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php
index 55b64d2..b4db724 100644 (file)
--- a/maintenance/fetchText.php
+++ b/maintenance/fetchText.php
@@ -28,7 +28,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,7 +49,14 @@ class FetchText extends Maintenance {
                        }
                        $textId = intval( $line );
                        $text = $this->doGetText( $db, $textId );
-                       $this->output( $textId . "\n" . 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 );
                }
        }