1 files changed, 55 insertions, 6 deletions

diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index eef009a0..e4ac6702 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -21,28 +21,77 @@ class Search_Controller extends Controller {
   public function index() {
     $page_size = module::get_var("gallery", "page_size", 9);
     $q = Input::instance()->get("q");
+    $q_with_more_terms = search::add_query_terms($q);
+    $show = Input::instance()->get("show");
+
+    if ($show) {
+      $child = ORM::factory("item", $show);
+      $index = search::get_position($child, $q_with_more_terms);
+      if ($index) {
+        $page = ceil($index / $page_size);
+        url::redirect(url::abs_site("search?q=" . urlencode($q) . ($page == 1 ? "" : "&page=$page")));
+      }
+    }
+
     $page = Input::instance()->get("page", 1);
-    $offset = ($page - 1) * $page_size;
 
     // Make sure that the page references a valid offset
     if ($page < 1) {
       $page = 1;
     }
 
-    list ($count, $result) = search::search($q, $page_size, $offset);
+    $offset = ($page - 1) * $page_size;
+
+    list ($count, $result) = search::search($q_with_more_terms, $page_size, $offset);
+
+    $title = t("Search: %q", array("q" => $q_with_more_terms));
 
     $max_pages = max(ceil($count / $page_size), 1);
 
     $template = new Theme_View("page.html", "collection", "search");
-    $template->set_global(array("page" => $page,
-                                "max_pages" => $max_pages,
-                                "page_size" => $page_size,
-                                "children_count" => $count));
+    $root = item::root();
+    $template->set_global(
+      array("page" => $page,
+            "max_pages" => $max_pages,
+            "page_size" => $page_size,
+            "breadcrumbs" => array(
+              Breadcrumb::instance($root->title, $root->url())->set_first(),
+              Breadcrumb::instance($q, url::abs_site("search?q=" . urlencode($q)))->set_last(),
+            ),
+            "children_count" => $count));
 
     $template->content = new View("search.html");
     $template->content->items = $result;
     $template->content->q = $q;
 
     print $template;
+
+    item::set_display_context_callback(
+      "Search_Controller::get_display_context", $title, $q_with_more_terms, $q);
+  }
+
+  static function get_display_context($item, $title, $query_terms, $q) {
+    $position = search::get_position($item, $query_terms);
+
+    if ($position > 1) {
+      list ($count, $result_data) = search::search($query_terms, 3, $position - 2);
+      list ($previous_item, $ignore, $next_item) = $result_data;
+    } else {
+      $previous_item = null;
+      list ($count, $result_data) = search::search($query_terms, 1, $position);
+      list ($next_item) = $result_data;
+    }
+
+    $search_url = url::abs_site("search?q=" . urlencode($q) . "&show={$item->id}");
+    $root = item::root();
+
+    return array("position" => $position,
+                 "previous_item" => $previous_item,
+                 "next_item" => $next_item,
+                 "sibling_count" => $count,
+                 "breadcrumbs" => array(
+                   Breadcrumb::instance($root->title, "/", $root->id)->set_first(),
+                   Breadcrumb::instance(t("Search: %q", array("q" => $q)), $search_url),
+                   Breadcrumb::instance($item->title, $item->url())->set_last()));
   }
 }