Fixes a bug with MixArchiveIterator and UnionIterator crawls, a=chris

Chris Pollett [2013-03-19 15:Mar:th]
Fixes a bug with MixArchiveIterator and UnionIterator crawls, a=chris
Filename
bin/fetcher.php
lib/archive_bundle_iterators/mix_archive_bundle_iterator.php
lib/index_bundle_iterators/union_iterator.php
diff --git a/bin/fetcher.php b/bin/fetcher.php
index 42ab970a0..54634edb4 100755
--- a/bin/fetcher.php
+++ b/bin/fetcher.php
@@ -503,7 +503,8 @@ class Fetcher implements CrawlConstants
                     $this->to_crawl = array();
                 }
             } else if ($this->crawl_type == self::ARCHIVE_CRAWL &&
-                    $this->arc_type != "WebArchiveBundle") { /* case(2) */
+                    $this->arc_type != "WebArchiveBundle" &&
+                    $this->arc_type != "") { /* case(2) */
                 // An archive crawl with data coming from the name server.
                 crawlLog("MAIN LOOP CASE 2 -- ARCHIVE SCHEDULER (NOT RECRAWL)");
                 $info = $this->checkArchiveScheduler();
diff --git a/lib/archive_bundle_iterators/mix_archive_bundle_iterator.php b/lib/archive_bundle_iterators/mix_archive_bundle_iterator.php
index 903fb0187..9c9db61ed 100644
--- a/lib/archive_bundle_iterators/mix_archive_bundle_iterator.php
+++ b/lib/archive_bundle_iterators/mix_archive_bundle_iterator.php
@@ -123,7 +123,7 @@ class MixArchiveBundleIterator extends ArchiveBundleIterator
      */
     function getArchiveName($timestamp)
     {
-        return CRAWL_DIR."/schedules/".self::archive_iterator.$timestamp;
+        return CRAWL_DIR."/schedules/".self::name_archive_iterator.$timestamp;
     }

     /**
diff --git a/lib/index_bundle_iterators/union_iterator.php b/lib/index_bundle_iterators/union_iterator.php
index 3dfee55ff..23260ffe4 100644
--- a/lib/index_bundle_iterators/union_iterator.php
+++ b/lib/index_bundle_iterators/union_iterator.php
@@ -209,10 +209,11 @@ class UnionIterator extends IndexBundleIterator
             if(!isset($this->pages[$doc_key]["ITERATOR"])) {
                 continue;
             } else {
-                $out_pages[$doc_key] = $this->index_bundle_iterators[
+                $tmp = $this->index_bundle_iterators[
                     $this->pages[
-                        $doc_key]["ITERATOR"]]->getSummariesFromCurrentDocs(
+                        $doc_key]["ITERATOR"]]->getCurrentDocsForKeys(
                             array($doc_key));
+                $out_pages[$doc_key] = $tmp[$doc_key];
             }
         }
         return $out_pages;
@@ -279,4 +280,4 @@ class UnionIterator extends IndexBundleIterator
             a union iterator", E_USER_ERROR);
     }
 }
-?>
\ No newline at end of file
+?>
ViewGit