X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnoticesearchrss.php;h=20fe0ff2abddfe337ef78b00d7028e6dbecb98a5;hb=2f99a257a0d8bd773ea96249b13b134fcfbc99cd;hp=f598d833eb8fd35981616d5d69679ff201629092;hpb=3632a76773dbfc31cf6f99ad831bf13f793871ae;p=quix0rs-gnu-social.git

diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index f598d833eb..20fe0ff2ab 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -23,55 +23,53 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class NoticesearchrssAction extends Rss10Action {
-
-	function init() {
-		return true;
-	}
-
-	function get_notices($limit=0) {
-
-		$q = $this->trimmed('q');
-		$notices = array();
-
-		$notice = new Notice();
-
-		# lcase it for comparison
-		$q = strtolower($q);
-
-		if(common_config('db','type')=='mysql') {
-			$notice->whereAdd('MATCH(content) against (\''.addslashes($q).'\')');
-		} else {
-			$notice->whereAdd('to_tsvector(\'english\',content) @@ plainto_tsquery(\''.addslashes($q).'\')');
-		}
-		$notice->orderBy('created DESC, notice.id DESC');
-
-		# Ask for an extra to see if there's more.
-
-		if ($limit != 0) {
-			$notice->limit(0, $limit);
-		}
-
-		$notice->find();
-
-		while ($notice->fetch()) {
-			$notices[] = clone($notice);
-		}
-
-		return $notices;
-	}
-
-	function get_channel() {
-		global $config;
-		$q = $this->trimmed('q');
-		$c = array('url' => common_local_url('noticesearchrss', array('q' => $q)),
-				   'title' => $config['site']['name'] . sprintf(_(' Search Stream for "%s"'), $q),
-				   'link' => common_local_url('noticesearch', array('q' => $q)),
-				   'description' => sprintf(_('All updates matching search term "%s"'), $q));
-		return $c;
-	}
-
-	function get_image() {
-		return NULL;
-	}
+class NoticesearchrssAction extends Rss10Action
+{
+
+    function init()
+    {
+        return true;
+    }
+
+    function get_notices($limit=0)
+    {
+
+        $q = $this->trimmed('q');
+        $notices = array();
+
+        $notice = new Notice();
+
+        # lcase it for comparison
+        $q = strtolower($q);
+
+        $search_engine = $notice->getSearchEngine('identica_notices');
+        $search_engine->set_sort_mode('chron');
+
+        if (!$limit) $limit = 20;
+        $search_engine->limit(0, $limit, true);
+        $search_engine->query($q);
+        $notice->find();
+
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+    function get_channel()
+    {
+        global $config;
+        $q = $this->trimmed('q');
+        $c = array('url' => common_local_url('noticesearchrss', array('q' => $q)),
+                   'title' => $config['site']['name'] . sprintf(_(' Search Stream for "%s"'), $q),
+                   'link' => common_local_url('noticesearch', array('q' => $q)),
+                   'description' => sprintf(_('All updates matching search term "%s"'), $q));
+        return $c;
+    }
+
+    function get_image()
+    {
+        return null;
+    }
 }