From 2b6daf6c00f1e1222bae6949ee87552e1de43a47 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 10 Sep 2005 21:30:16 +0000
Subject: [PATCH] enhance titleSearch

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4804 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/WikiDB/backend.php        |  6 +++---
 lib/WikiDB/backend/ADODB.php  | 11 ++++++++---
 lib/WikiDB/backend/PDO.php    | 13 +++++++++----
 lib/WikiDB/backend/PearDB.php | 11 ++++++++---
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/lib/WikiDB/backend.php b/lib/WikiDB/backend.php
index 42fd56699..dd7b77ca0 100644
--- a/lib/WikiDB/backend.php
+++ b/lib/WikiDB/backend.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: backend.php,v 1.23 2005-02-11 14:45:44 rurban Exp $');
+rcs_id('$Id: backend.php,v 1.24 2005-09-10 21:30:16 rurban Exp $');
 
 /*
   Pagedata
@@ -328,14 +328,14 @@ class WikiDB_backend
      *
      * @see WikiDB::titleSearch
      */
-    function text_search($search, $fulltext=false) {
+    function text_search($search, $fulltext=false, $sortby=false, $limit=false, $exclude=false) {
         // This is method implements a simple linear search
         // through all the pages in the database.
         //
         // It is expected that most backends will overload
         // this method with something more efficient.
         include_once('lib/WikiDB/backend/dumb/TextSearchIter.php');
-        $pages = $this->get_all_pages(false);
+        $pages = $this->get_all_pages(false, $sortby, $limit, $exclude);
         return new WikiDB_backend_dumb_TextSearchIter($this, $pages, $search, $fulltext);
     }
 
diff --git a/lib/WikiDB/backend/ADODB.php b/lib/WikiDB/backend/ADODB.php
index 540d7dbac..142e75678 100644
--- a/lib/WikiDB/backend/ADODB.php
+++ b/lib/WikiDB/backend/ADODB.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: ADODB.php,v 1.74 2005-02-10 19:04:22 rurban Exp $');
+rcs_id('$Id: ADODB.php,v 1.75 2005-09-10 21:30:16 rurban Exp $');
 
 /*
  Copyright 2002,2004 $ThePhpWikiProgrammingTeam
@@ -747,9 +747,11 @@ extends WikiDB_backend
     /**
      * Title search.
      */
-    function text_search($search, $fullsearch=false) {
+    function text_search($search, $fullsearch=false, $sortby=false, $limit=false, $exclude=false)) {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
+        $orderby = $this->sortby($sortby, 'db');
+        if ($orderby) $orderby = ' ORDER BY ' . $orderby;
         
         $table = "$nonempty_tbl, $page_tbl";
         $join_clause = "$nonempty_tbl.id=$page_tbl.id";
@@ -775,7 +777,7 @@ extends WikiDB_backend
         $result = $dbh->Execute("SELECT $fields FROM $table"
                                 . " WHERE $join_clause"
                                 . " AND ($search_clause)"
-                                . " ORDER BY pagename");
+                                . $orderby);
         return new WikiDB_backend_ADODB_iter($this, $result, $field_list);
     }
     /*
@@ -1429,6 +1431,9 @@ extends WikiDB_backend_search
     }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.74  2005/02/10 19:04:22  rurban
+// move getRow up one level to our backend class
+//
 // Revision 1.73  2005/02/04 13:43:30  rurban
 // fix purge cache error
 //
diff --git a/lib/WikiDB/backend/PDO.php b/lib/WikiDB/backend/PDO.php
index 9186fbfdc..76f7e3de7 100755
--- a/lib/WikiDB/backend/PDO.php
+++ b/lib/WikiDB/backend/PDO.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PDO.php,v 1.2 2005-02-11 14:45:45 rurban Exp $');
+rcs_id('$Id: PDO.php,v 1.3 2005-09-10 21:30:16 rurban Exp $');
 
 /*
  Copyright 2005 $ThePhpWikiProgrammingTeam
@@ -832,10 +832,12 @@ extends WikiDB_backend
     /**
      * Title search.
      */
-    function text_search($search, $fullsearch=false) {
+    function text_search($search, $fullsearch=false, $sortby=false, $limit=false, $exclude=false) {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
-        
+        $orderby = $this->sortby($sortby, 'db');
+        if ($orderby) $orderby = ' ORDER BY ' . $orderby;
+
         $table = "$nonempty_tbl, $page_tbl";
         $join_clause = "$nonempty_tbl.id=$page_tbl.id";
         $fields = $this->page_tbl_fields;
@@ -860,7 +862,7 @@ extends WikiDB_backend
         $sth = $dbh->prepare("SELECT $fields FROM $table"
                                 . " WHERE $join_clause"
                                 . " AND ($search_clause)"
-                                . " ORDER BY pagename");
+                                . $orderby);
         $sth->execute();
         $result = $sth->fetch(PDO_FETCH_NUM);
         return new WikiDB_backend_PDO_iter($this, $result, $field_list);
@@ -1450,6 +1452,9 @@ extends WikiDB_backend_search
     }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.2  2005/02/11 14:45:45  rurban
+// support ENABLE_LIVESEARCH, enable PDO sessions
+//
 // Revision 1.1  2005/02/10 19:01:22  rurban
 // add PDO support
 //
diff --git a/lib/WikiDB/backend/PearDB.php b/lib/WikiDB/backend/PearDB.php
index f56b5a93d..69dcba1e3 100644
--- a/lib/WikiDB/backend/PearDB.php
+++ b/lib/WikiDB/backend/PearDB.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PearDB.php,v 1.88 2005-08-06 13:20:05 rurban Exp $');
+rcs_id('$Id: PearDB.php,v 1.89 2005-09-10 21:30:16 rurban Exp $');
 
 require_once('lib/WikiDB/backend.php');
 //require_once('lib/FileFinder.php');
@@ -646,9 +646,11 @@ extends WikiDB_backend
     /**
      * Title search.
      */
-    function text_search($search, $fulltext=false) {
+    function text_search($search, $fulltext=false, $sortby=false, $limit=false, $exclude=false) {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
+        $orderby = $this->sortby($sortby, 'db');
+        if ($orderby) $orderby = ' ORDER BY ' . $orderby;
 
         $searchclass = get_class($this)."_search";
         // no need to define it everywhere and then fallback. memory!
@@ -677,7 +679,7 @@ extends WikiDB_backend
         $result = $dbh->query("SELECT $fields FROM $table"
                               . " WHERE $join_clause"
                               . "  AND ($search_clause)"
-                              . " ORDER BY pagename");
+                              . $orderby);
         
         return new WikiDB_backend_PearDB_iter($this, $result);
     }
@@ -1232,6 +1234,9 @@ extends WikiDB_backend_search
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.88  2005/08/06 13:20:05  rurban
+// add comments
+//
 // Revision 1.87  2005/02/10 19:04:24  rurban
 // move getRow up one level to our backend class
 //
-- 
2.45.0