sphinx integration for notices and profiles

darcs-hash:20081123185136-099f7-ca600dbdfff09762802e1cc58cf8777c45a24402.gz

1 files changed, 7 insertions, 4 deletions

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index f8dad2a20..96e4d777f 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -20,7 +20,6 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/searchaction.php');
-define('NOTICES_PER_PAGE', 20);
 
 # XXX common parent for people and content search?
 
@@ -42,13 +41,17 @@ class NoticesearchAction extends SearchAction {
 		$q = strtolower($q);
 
         $search_engine = $notice->getSearchEngine('identica_notices');
-        $search_engine->query($q);
 
+        $search_engine->set_sort_mode('chron');
 		# Ask for an extra to see if there's more.
 		$search_engine->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
-		$cnt = $notice->find();
-
+        if (false === $search_engine->query($q)) {
+            $cnt = 0;
+        }
+        else {
+	    	$cnt = $notice->find();
+        }
 		if ($cnt > 0) {
 			$terms = preg_split('/[\s,]+/', $q);
 			common_element_start('ul', array('id' => 'notices'));