From d45a73777935c86fc5131955831833d7465b5e9d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 21 Jan 2013 01:22:01 -0500
Subject: Update copyright to 2013.  Fixes #1953.

---
 modules/search/helpers/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/search/helpers/search.php')

diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 32b36e73..b1bde359 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2012 Bharat Mediratta
+ * Copyright (C) 2000-2013 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
-- 
cgit v1.2.3


From c4b2f79a677e38a9af87827ad2e753275eb37f6b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 5 Feb 2013 13:02:26 -0500
Subject: Force a sort order no sibling checks.  Fixes #1990.

---
 modules/search/helpers/search.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'modules/search/helpers/search.php')

diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index b1bde359..b21e59dd 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -132,11 +132,12 @@ class search_Core {
 
   static function get_position_within_album($item, $q, $album) {
     $page_size = module::get_var("gallery", "page_size", 9);
-    $query = self::_build_query_base($q, $album, array("{items}.id = " . $item->id));
+    $query = self::_build_query_base($q, $album, array("{items}.id = " . $item->id)) .
+      "ORDER BY `score` DESC ";
     $db = Database::instance();
 
     // Truncate the score by two decimal places as this resolves the issues
-    // that arise due to in exact numeric conversions.
+    // that arise due to inexact numeric conversions.
     $current = $db->query($query)->current();
     if (!$current) {
       // We can't find this result in our result set - perhaps we've fallen out of context?  Clear
@@ -149,7 +150,10 @@ class search_Core {
       $score = substr($score, 0, strlen($score) - 2);
     }
 
-    $data = $db->query(self::_build_query_base($q, $album) . " HAVING `score` >= " . $score);
+    // Redo the query but only look for results greater than or equal to our current location
+    // then seek backwards until we find our item.
+    $data = $db->query(self::_build_query_base($q, $album) . " HAVING `score` >= " . $score .
+                       "ORDER BY `score` DESC ");
     $data->seek($data->count() - 1);
 
     while ($data->get("id") != $item->id && $data->prev()->valid()) {
-- 
cgit v1.2.3