Changeset 1613

Timestamp:

10/24/06 16:45:25 (2 years ago)

Author:

mbonetti

Message:

Initial work to implement OpenSearch? capabilities in Gregarius.
See:
http://developer.mozilla.org/en/docs/Supporting_search_suggestions_in_search_plugins

Location:

trunk/gregarius

Files:

• api.php (modified) (2 diffs)
• cls/search.php (modified) (5 diffs)
• extlib/JSON.php (added)

trunk/gregarius/api.php

@@ -49 +49 @@
         blGetItems($cid,$date,$markread);
         break;
-    }
+    case 'search':
+        rss_require('extlib/JSON.php');
+        $json = new Services_JSON();
+        $query = sanitize(@$_REQUEST['q'], RSS_SANITIZER_WORDS);
+        if ($query) {
+            $res = osSearch($query);
+        } else {
+            $res = array($query,array());
+        }
+        header('Content-Type: application/json');
+        die ($json->encode($res));
+        break;
+    }
+
 }
 
@@ -195 +208 @@
 
 }
+
+function osSearch($q) {
+    rss_require('cls/search.php');
+    $sil = new SearchItemList($q,5);
+    $results = array();
+    foreach($sil -> feeds as $feed) {
+        foreach($feed -> items as $item) {
+            $results[] = $item -> title;
+        }
+    }
+    return array($q,$results);
+}
 ?>

trunk/gregarius/cls/search.php

@@ -43 +43 @@
 define ('QUERY_MATCH_EXACT','exact');
 
+// This is needed for some constants
+rss_require('cls/wrappers/toolkit.php');
 
 class SearchItemList extends ItemList {
@@ -51 +53 @@
 
     var $currentPage;
-    var $resultsPerPage;
+    var $resultsPerPage = 0;
     var $startItem;
     var $endItem;
@@ -58 +60 @@
     var $logicSep;
 
-    function SearchItemList() {
+    function SearchItemList($query=null,$results=0) {
         parent::ItemList();
+        if ($query) {
+            $this -> query=$query;
+        } elseif(isset($_REQUEST[QUERY_PRM])) {
+            $this->query = $_REQUEST[QUERY_PRM];
+        }else{
+            $this -> query = null;
+        }
+        
+        
+        // Sanitize the query parameters:
+        // fixme: this probably breaks on queries with weird characters, depending
+        // on the locale. 
+        // see: http://php.benscom.com/manual/en/reference.pcre.pattern.syntax.php
+        if ($this -> query) {
+            $this -> query = trim(preg_replace('#[^\w\s\x80-\xff]#','',$this -> query));
+        }
+        
+        $this->resultsPerPage = (int) $results;
+        
         $this -> populate();
 
@@ -101 +122 @@
 
     function populate() {
-        if (!isset($_REQUEST[QUERY_PRM])) {
-            return;
-        }
-
-                // fixme: this probably breaks on queries with weird characters, depending
-                // on the locale. 
-                // see: http://php.benscom.com/manual/en/reference.pcre.pattern.syntax.php
-        $this->query = trim(preg_replace('#[^\w\s\x80-\xff]#','',$_REQUEST[QUERY_PRM]));
         
         if (!$this->query) {
@@ -122 +135 @@
             RSS_SANITIZER_NUMERIC);
 
-        $this->resultsPerPage = sanitize(
-            ((array_key_exists(QUERY_RESULTS, $_REQUEST)) ? $_REQUEST[QUERY_RESULTS] : INFINE_RESULTS),
-            RSS_SANITIZER_NUMERIC);
-        
+        if (!$this->resultsPerPage) {
+            $this->resultsPerPage = sanitize(
+                ((array_key_exists(QUERY_RESULTS, $_REQUEST)) ? $_REQUEST[QUERY_RESULTS] : INFINE_RESULTS),
+                RSS_SANITIZER_NUMERIC);
+        }
+
         $this->currentPage = sanitize(
             (array_key_exists(QUERY_CURRENT_PAGE, $_REQUEST) ? $_REQUEST[QUERY_CURRENT_PAGE] : 0),