XML snapshots: when retrieving revision text, send the text id back to requester...

diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index 86e00b0..931b445 100644 (file)
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -331,7 +331,17 @@ class TextPassDumper extends BackupDumper {
                $ok = fflush( $this->spawnWrite );
                // $this->progress( ">> [flush]" );
                if ( !$ok ) return false;
-               
+
+               // check that the text id they are sending is the one we asked for
+               // this avoids out of sync revision text errors we have encountered in the past
+               $newId = fgets( $this->spawnRead );
+               if ( $newId === false ) {
+                       return false;
+               }
+               if ( $id != intval( $newId ) ) {
+                       return false;
+               }
+
                $len = fgets( $this->spawnRead );
                // $this->progress( "<< " . trim( $len ) );
                if ( $len === false ) return false;

diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php
index 809a1f2..55b64d2 100644 (file)
--- a/maintenance/fetchText.php
+++ b/maintenance/fetchText.php
@@ -39,7 +39,7 @@ class FetchText extends Maintenance {
                        }
                        $textId = intval( $line );
                        $text = $this->doGetText( $db, $textId );
-                       $this->output( strlen( $text ) . "\n" . $text );
+                       $this->output( $textId . "\n" . strlen( $text ) . "\n" . $text );
                }
        }