Testing a modification to getCrawlItems take3, a=chris

Chris Pollett [2012-12-21 03:Dec:st]
Testing a modification to getCrawlItems take3, a=chris
Filename
controllers/crawl_controller.php
models/parallel_model.php
diff --git a/controllers/crawl_controller.php b/controllers/crawl_controller.php
index 27f5dc0e3..12a828fa2 100644
--- a/controllers/crawl_controller.php
+++ b/controllers/crawl_controller.php
@@ -257,11 +257,8 @@ class CrawlController extends Controller implements CrawlConstants
         $lookups = unserialize(webdecode($_REQUEST["arg"]));
         $our_lookups = array();
         foreach($lookups as $lookup => $lookup_info) {
-            if(count($lookup_info) == 3 && $lookup_info[0][0] === 'h') {
-                list($url, $index_name, $index) = $lookup_info;
-                if($index == $i) {
-                    $our_lookups[$lookup] = array($url, $index_name);
-                }
+            if(count($lookup_info) == 2 && $lookup_info[0][0] === 'h') {
+                $our_lookups[$lookup] = $lookup_info;
             } else {
                 $our_lookups[$lookup] = array();
                 foreach($lookup_info as $lookup_item) {
diff --git a/models/parallel_model.php b/models/parallel_model.php
index 82d0ac273..a37d73923 100755
--- a/models/parallel_model.php
+++ b/models/parallel_model.php
@@ -154,38 +154,27 @@ class ParallelModel extends Model implements CrawlConstants
         //Set-up network request
         $machines = array();
         $indexes = array();
-        $out_lookups = array();
         $num_machines = count($machine_urls);
         foreach($lookups as $lookup => $lookup_info) {
             if(count($lookup_info) == 2 && $lookup_info[0][0] === 'h') {
-                list($url, $index_name) = $lookup_info;
-                $machines_at_time = $this->getMachinesTimestamp($index_name,
-                    $machine_urls);
-                $index = calculatePartition($url, count($machines_at_time),
-                    "UrlParser::getHost");
-                $machine_pos = array_search($machines_at_time[$index],
-                    $machine_urls);
-                $machines[$machine_pos] = $machine_urls[$machine_pos];
-                $lookup_info[3] = $index;
-                $out_lookups[$lookup] = $lookup_info;
+                $machines = $machine_urls;
+                break;
             } else {
                 foreach($lookup_info as $lookup_item) {
                     $out_lookup_info = array();
                     if(count($lookup_item) == 5) {
-                        list($index, , $index_name, , ) = $lookup_item;
+                        list($index, , , , ) = $lookup_item;
                         $machines[$index] = $machine_urls[$index];
-                        $out_lookup_info[] = $lookup_item;
                     } else {
-                        $out_lookup_info[] = $lookup_item;
                         $machines = $machine_urls;
+                        break;
                     }
                 }
-                $out_lookups[$lookup] = $out_lookup_info;
             }
         }
         //Make request
         $page_set = $this->execMachines("getCrawlItems",
-            $machines, serialize($out_lookups), $num_machines);
+            $machines, serialize($lookups), $num_machines);
         //Aggregate results
         $summaries = array();
         $elapsed_times = array();
ViewGit