From: Reini U. <ru...@us...> - 2005-09-10 21:30:29
|
Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31259/WikiDB/backend Modified Files: ADODB.php PDO.php PearDB.php Log Message: enhance titleSearch Index: ADODB.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/ADODB.php,v retrieving revision 1.74 retrieving revision 1.75 diff -u -2 -b -p -d -r1.74 -r1.75 --- ADODB.php 10 Feb 2005 19:04:22 -0000 1.74 +++ ADODB.php 10 Sep 2005 21:30:16 -0000 1.75 @@ -748,7 +748,9 @@ 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"; @@ -776,5 +778,5 @@ extends WikiDB_backend . " WHERE $join_clause" . " AND ($search_clause)" - . " ORDER BY pagename"); + . $orderby); return new WikiDB_backend_ADODB_iter($this, $result, $field_list); } @@ -1430,4 +1432,7 @@ extends WikiDB_backend_search // $Log$ +// Revision 1.75 2005/09/10 21:30:16 rurban +// enhance titleSearch +// // Revision 1.74 2005/02/10 19:04:22 rurban // move getRow up one level to our backend class Index: PDO.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PDO.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -2 -b -p -d -r1.2 -r1.3 --- PDO.php 11 Feb 2005 14:45:45 -0000 1.2 +++ PDO.php 10 Sep 2005 21:30:16 -0000 1.3 @@ -833,7 +833,9 @@ 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"; @@ -861,5 +863,5 @@ extends WikiDB_backend . " WHERE $join_clause" . " AND ($search_clause)" - . " ORDER BY pagename"); + . $orderby); $sth->execute(); $result = $sth->fetch(PDO_FETCH_NUM); @@ -1451,4 +1453,7 @@ extends WikiDB_backend_search // $Log$ +// Revision 1.3 2005/09/10 21:30:16 rurban +// enhance titleSearch +// // Revision 1.2 2005/02/11 14:45:45 rurban // support ENABLE_LIVESEARCH, enable PDO sessions Index: PearDB.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB.php,v retrieving revision 1.88 retrieving revision 1.89 diff -u -2 -b -p -d -r1.88 -r1.89 --- PearDB.php 6 Aug 2005 13:20:05 -0000 1.88 +++ PearDB.php 10 Sep 2005 21:30:16 -0000 1.89 @@ -647,7 +647,9 @@ 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"; @@ -678,5 +680,5 @@ extends WikiDB_backend . " WHERE $join_clause" . " AND ($search_clause)" - . " ORDER BY pagename"); + . $orderby); return new WikiDB_backend_PearDB_iter($this, $result); @@ -1233,4 +1235,7 @@ extends WikiDB_backend_search // $Log$ +// Revision 1.89 2005/09/10 21:30:16 rurban +// enhance titleSearch +// // Revision 1.88 2005/08/06 13:20:05 rurban // add comments |