[Fusionforge-commits] r14560 - in branches/Branch_5_1: . src/common/search

Roland Mas lolando at fusionforge.org
Fri Oct 7 16:29:24 CEST 2011


Author: lolando
Date: 2011-10-07 16:29:23 +0200 (Fri, 07 Oct 2011)
New Revision: 14560

Modified:
   branches/Branch_5_1/
   branches/Branch_5_1/src/common/search/DocsSearchQuery.class.php
   branches/Branch_5_1/src/common/search/TasksSearchQuery.class.php
Log:
Fixed SQL queries

Modified: branches/Branch_5_1/src/common/search/DocsSearchQuery.class.php
===================================================================
--- branches/Branch_5_1/src/common/search/DocsSearchQuery.class.php	2011-10-07 14:29:11 UTC (rev 14559)
+++ branches/Branch_5_1/src/common/search/DocsSearchQuery.class.php	2011-10-07 14:29:23 UTC (rev 14560)
@@ -104,8 +104,8 @@
 		$qpa = db_construct_qpa () ;
 
 		$qpa = db_construct_qpa ($qpa,
-					 'SELECT doc_data.docid, doc_data.filename, ts_headline(doc_data.title, q) AS title, ts_headline(doc_data.description, q) AS description doc_groups.groupname FROM doc_data, doc_groups, doc_data_idx, to_tsquery($1) q',
-					 array (implode (' ', $words))) ;
+					 'SELECT doc_data.docid, doc_data.filename, ts_headline(doc_data.title, q) AS title, ts_headline(doc_data.description, q) AS description, doc_groups.groupname FROM doc_data, doc_groups, doc_data_idx, to_tsquery($1) AS q',
+					 array ($words)) ;
 		$qpa = db_construct_qpa ($qpa,
 					 ' WHERE doc_data.doc_group = doc_groups.doc_group AND doc_data.docid = doc_data_idx.docid AND (vectors @@ q') ;
 		if (count($this->phrases)) {

Modified: branches/Branch_5_1/src/common/search/TasksSearchQuery.class.php
===================================================================
--- branches/Branch_5_1/src/common/search/TasksSearchQuery.class.php	2011-10-07 14:29:11 UTC (rev 14559)
+++ branches/Branch_5_1/src/common/search/TasksSearchQuery.class.php	2011-10-07 14:29:23 UTC (rev 14560)
@@ -86,9 +86,11 @@
 				$qpa = db_construct_qpa ($qpa,
 							 'AND project_group_list.is_public = 1 ') ;
 			}
+			$qpa = db_construct_qpa ($qpa,
+						 'AND vectors @@ q ') ;
 			if (count($this->phrases)) {
 				$qpa = db_construct_qpa ($qpa,
-							 'AND (vectors @@ q AND (') ;
+							 'AND ((') ;
 				$qpa = $this->addMatchCondition($qpa, 'summary');
 				$qpa = db_construct_qpa ($qpa,
 							 ') OR (') ;




More information about the Fusionforge-commits mailing list