Improves issues with cache pages when a crawl mix is being used, a=chris

Chris Pollett [2011-05-14 20:May:th]
Improves issues with cache pages when a crawl mix is being used, a=chris
Filename
controllers/search_controller.php
css/search.css
locale/en-US/statistics.txt
models/phrase_model.php
views/layouts/web_layout.php
views/search_view.php
diff --git a/controllers/search_controller.php b/controllers/search_controller.php
index bd0f7b2ff..8a6dcf67e 100755
--- a/controllers/search_controller.php
+++ b/controllers/search_controller.php
@@ -292,7 +292,6 @@ class SearchController extends Controller implements CrawlConstants

             break;
         }
-
         $data['PAGES'] = (isset($phrase_results['PAGES'])) ?
              $phrase_results['PAGES']: array();
         $data['TOTAL_ROWS'] = (isset($phrase_results['TOTAL_ROWS'])) ?
@@ -300,7 +299,6 @@ class SearchController extends Controller implements CrawlConstants
         $data['LIMIT'] = $limit;
         $data['RESULTS_PER_PAGE'] = $results_per_page;

-
         return $data;

     }
diff --git a/css/search.css b/css/search.css
index ef537c8e0..66f4b8616 100755
--- a/css/search.css
+++ b/css/search.css
@@ -150,7 +150,7 @@ body.html-tb-lr
 {
     position:absolute;
     top:1.5in;
-    left:2.5in;
+    left:12%;
     min-width:6in;
 }

@@ -158,7 +158,7 @@ body.html-tb-lr
 {
     position:absolute;
     top:1.5in;
-    right:2.5in;
+    right:12%;
     min-width:6in;
 }

diff --git a/locale/en-US/statistics.txt b/locale/en-US/statistics.txt
index eedae9b06..5a165df53 100755
--- a/locale/en-US/statistics.txt
+++ b/locale/en-US/statistics.txt
@@ -1 +1 @@
-d:98;
\ No newline at end of file
+d:100;
\ No newline at end of file
diff --git a/models/phrase_model.php b/models/phrase_model.php
index 40efe8e5b..4a229ea31 100755
--- a/models/phrase_model.php
+++ b/models/phrase_model.php
@@ -583,6 +583,9 @@ class PhraseModel extends Model
             $num_retrieved < $to_retrieve) {
             foreach($next_docs as $doc_key => $doc_info) {
                 $summary = & $doc_info[CrawlConstants::SUMMARY];
+                $tmp = unserialize($query_iterator->getIndex(
+                    $doc_key)->description);
+                $doc_info[self::CRAWL_TIME] = $tmp[self::CRAWL_TIME];
                 unset($doc_info[CrawlConstants::SUMMARY]);
                 if(is_array($summary)) {
                     $pages[] = array_merge($doc_info, $summary);
diff --git a/views/layouts/web_layout.php b/views/layouts/web_layout.php
index adfccff32..64e6504c3 100755
--- a/views/layouts/web_layout.php
+++ b/views/layouts/web_layout.php
@@ -69,8 +69,6 @@ class WebLayout extends Layout

             <meta name="description" content="<?php
                 e(tl('web_layout_description')); ?>" />
-            <meta name = "viewport" content = "width = device-width
-            initial-scale = .25">
             <meta charset="utf-8" />
             <link rel="shortcut icon"   href="favicon.ico" />
             <link rel="stylesheet" type="text/css" href="css/search.css" />
diff --git a/views/search_view.php b/views/search_view.php
index 11b24f548..7673d46ca 100755
--- a/views/search_view.php
+++ b/views/search_view.php
@@ -146,7 +146,7 @@ class SearchView extends View implements CrawlConstants
                             ?>&amp;c=search&amp;a=cache&amp;q=<?php
                             e($data['QUERY']); ?>&amp;arg=<?php
                             e(urlencode($page[self::URL]));
-                            ?>&amp;its=<?php e($data['its']); ?>" >
+                            ?>&amp;its=<?php e($page[self::CRAWL_TIME]); ?>" >
                         <?php
                         if($page[self::TYPE] == "text/html" ||
                             stristr($page[self::TYPE], "image")) {
@@ -163,7 +163,7 @@ class SearchView extends View implements CrawlConstants
                     <a href="?YIOOP_TOKEN=<?php e($data['YIOOP_TOKEN']);
                         ?>&amp;c=search&amp;a=related&amp;arg=<?php
                         e(urlencode($page[self::URL])); ?>&amp;<?php
-                        ?>its=<?php e($data['its']); ?>" ><?php
+                        ?>its=<?php e($page[self::CRAWL_TIME]); ?>" ><?php
                         e(tl('search_view_similar'));
                     ?></a>.
                     <?php
@@ -173,7 +173,7 @@ class SearchView extends View implements CrawlConstants
                         <a href="?YIOOP_TOKEN=<?php e($data['YIOOP_TOKEN']);
                         ?>&amp;c=search&amp;q=<?php
                         e(urlencode("link:".$page[self::URL])); ?>&amp;<?php
-                        ?>its=<?php e($data['its']); ?>" ><?php
+                        ?>its=<?php e($page[self::CRAWL_TIME]); ?>" ><?php
                         e(tl('search_view_inlink'));
                     ?></a>.
                     <?php
ViewGit