From ea056f624a470ea9fb04712e19ca2d38f47d5f1c Mon Sep 17 00:00:00 2001
From: nbm <nbm@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Thu, 10 Nov 2005 15:58:25 +0000
Subject: [PATCH] Make use of KTSearchUtil, and support saved searches.

---
 presentation/lookAndFeel/knowledgeTree/search/booleanSearch.php | 126 ++++++++++++++++++++++++------------------------------------------------------------------------------------------------------
 1 file changed, 24 insertions(+), 102 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/search/booleanSearch.php b/presentation/lookAndFeel/knowledgeTree/search/booleanSearch.php
index 5f65c2a..ade0a26 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/booleanSearch.php
+++ b/presentation/lookAndFeel/knowledgeTree/search/booleanSearch.php
@@ -9,6 +9,8 @@ require_once(KT_LIB_DIR . "/util/ktutil.inc");
 require_once(KT_LIB_DIR . "/dispatcher.inc.php");
 require_once(KT_LIB_DIR . "/browse/Criteria.inc");
 require_once(KT_LIB_DIR . "/visualpatterns/PatternBrowsableSearchResults.inc");
+require_once(KT_LIB_DIR . "/search/savedsearch.inc.php");
+require_once(KT_LIB_DIR . '/search/searchutil.inc.php');
 
 // specific includes
 
@@ -51,6 +53,11 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
         if (!is_array($datavars)) {
             $datavars = unserialize($datavars);
         }
+        $iSavedSearchId = KTUtil::arrayGet($_REQUEST, 'fSavedSearchId');
+        if (!empty($iSavedSearchId)) {
+            $oSearch = KTSavedSearch::get($iSavedSearchId);
+            $datavars = $oSearch->getSearch();
+        }
         
         if (empty($datavars)) {
             $this->errorRedirectToMain('You need to have at least 1 condition.');
@@ -60,109 +67,24 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
         
         return $res;
     }
-
-    function _oneCriteriaSetToSQL($aOneCriteriaSet) {
-        $aSQL = array();
-        $aJoinSQL = array();
-        $criteria_set = array();
-        foreach ($aOneCriteriaSet as $order => $dataset) {
-            $oCriterion = Criteria::getCriterionByNumber($dataset["type"]);             
-            if (PEAR::isError($oCriterion)) {
-                $this->errorRedirectToMain('Invalid criteria specified.');
-            }
-            $criteria_set[] = array($oCriterion, $dataset["data"]);
-        }
-		foreach ($criteria_set as $oCriterionPair) {
-		    $oCriterion = $oCriterionPair[0];
-			$aReq = $oCriterionPair[1];
-			$res = $oCriterion->searchSQL($aReq);
-			if (!is_null($res)) {
-				$aSQL[] = $res;
-			}
-			$res = $oCriterion->searchJoinSQL();
-			if (!is_null($res)) {
-				$aJoinSQL[] = $res;
-			}
-		}
-		
-		$aCritParams = array();
-		$aCritQueries = array();
-		foreach ($aSQL as $sSQL) {
-			if (is_array($sSQL)) {
-				$aCritQueries[] = '('.$sSQL[0].')';
-				$aCritParams = array_merge($aCritParams , $sSQL[1]);
-			} else {
-				$aCritQueries[] = '('.$sSQL.')';
-			}
-		}
-	
-		if (count($aCritQueries) == 0) {
-			$this->errorRedirectToMain("No search criteria were specified");
-			exit(0);
-		}
-	
-        return array($aCritQueries, $aCritParams, $aJoinSQL);
-    }
-
-    function criteriaSetToSQL($aCriteriaSet) {
-        $aJoinSQL = array();
-        $aSearchStrings = array();
-        $aParams = array();
-        foreach ($aCriteriaSet["subgroup"] as $k => $aOneCriteriaSet) {
-            if (is_null($aOneCriteriaSet["values"])) {
-                continue;
-            }
-            list($aThisCritQueries, $aThisParams, $aThisJoinSQL) = $this->_oneCriteriaSetToSQL($aOneCriteriaSet["values"]);
-            $aJoinSQL = array_merge($aJoinSQL, $aThisJoinSQL);
-            $aParams = array_merge($aParams, $aThisParams);
-            $aSearchStrings[] = "\n\t\t(\n\t\t\t" . join("\n " . KTUtil::arrayGet($aOneCriteriaSet, 'join', "AND") . " ", $aThisCritQueries) . "\n\t\t)";
-        }
-		$sJoinSQL = join(" ", $aJoinSQL);
-		$sSearchString = "\n\t(" . join("\n\t\t" . $aCriteriaSet['join'] . " ", $aSearchStrings) .  "\n\t)";
-        return array($sSearchString, $aParams, $sJoinSQL);
-    }
     
     function handleCriteriaSet($aCriteriaSet, $iStartIndex) {
-		global $default;
-        list($sSQLSearchString, $aCritParams, $sJoinSQL) = $this->criteriaSetToSQL($aCriteriaSet);
-	
-		$sToSearch = KTUtil::arrayGet($aOrigReq, 'fToSearch', 'Live'); // actually never present in this version.
-
-        $oPermission =& KTPermission::getByName('ktcore.permissions.read');
-        $sPermissionLookupsTable = KTUtil::getTableName('permission_lookups');
-        $sPermissionLookupAssignmentsTable = KTUtil::getTableName('permission_lookup_assignments');
-        $sPermissionDescriptorsTable = KTUtil::getTableName('permission_descriptors');
-        $aGroups = GroupUtil::listGroupsForUserExpand($_SESSION['userID']);
-        $aPermissionDescriptors = KTPermissionDescriptor::getByGroups($aGroups, array('ids' => true));
-        $sPermissionDescriptors = DBUtil::paramArray($aPermissionDescriptors);
-	
-		$sQuery = DBUtil::compactQuery("
-	SELECT
-		F.name AS folder_name, F.id AS folder_id, D.id AS document_id,
-		D.name AS document_name, D.filename AS file_name, COUNT(D.id) AS doc_count, 'View' AS view
-	FROM
-		$default->documents_table AS D
-		INNER JOIN $default->folders_table AS F ON D.folder_id = F.id
-		$sJoinSQL
-		INNER JOIN $default->status_table AS SL on D.status_id=SL.id
-        INNER JOIN $sPermissionLookupsTable AS PL ON D.permission_lookup_id = PL.id
-        INNER JOIN $sPermissionLookupAssignmentsTable AS PLA ON PL.id = PLA.permission_lookup_id AND PLA.permission_id = ?
-	WHERE
-        PLA.permission_descriptor_id IN ($sPermissionDescriptors)
-		AND SL.name = ?
-		AND ($sSQLSearchString)
-	GROUP BY D.id
-	ORDER BY doc_count DESC");
-	
-		$aParams = array();
-        $aParams[] = $oPermission->getId();
-        $aParams = array_merge($aParams, $aPermissionDescriptors);
-		$aParams[] = $sToSearch;
-		$aParams = array_merge($aParams, $aCritParams);
-	
-		//print '<pre>';var_dump(DBUtil::getResultArray(array($sQuery, $aParams)));
-		//exit(0);
-		//return '<pre>'.print_r(DBUtil::getResultArray(array($sQuery, $aParams)), true).'</pre>';
+        $aOrigCriteriaSet = $aCriteriaSet;
+        $aCriteriaSet = array(
+            "join" => "AND",
+            "subgroup" => array(
+                $aOrigCriteriaSet,
+                array(
+                    "join" => "AND",
+                    "values" => array(
+                        array(
+                            "sql" => array("D.id = ?", array(7)),
+                        ),
+                    ),
+                ),
+            ),
+        );
+        $aQuery = KTSearchUtil::criteriaToQuery($aCriteriaSet, $_SESSION['userID'], 'ktcore.permissions.read');
 		$aColumns = array("folder_name", "file_name", "document_name", "doc_count", "view");
 		$aColumnTypes = array(3,3,3,1,3);
 		$aColumnHeaders = array("<font color=\"ffffff\"><img src=$default->graphicsUrl/widgets/dfolder.gif>" . _("Folder") . "</font>", "<font color=\"ffffff\">" . _("Name") . "</font>", "<font color=\"ffffff\">" . _("Title") . "</font>", "<font color=\"ffffff\">" . _("Matches") . "</font>", "<font color=\"ffffff\">" . _("View") . "</font>");
@@ -170,7 +92,7 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
 		$aDBQueryStringColumns = array("document_id","folder_id");
 		$aQueryStringVariableNames = array("fDocumentID", "fFolderID");
 	
-		$oPatternBrowse = & new PatternBrowseableSearchResults(array($sQuery, $aParams), 10, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
+		$oPatternBrowse = & new PatternBrowseableSearchResults($aQuery, 10, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
 		$oPatternBrowse->setStartIndex($iStartIndex);
 		$oPatternBrowse->setSearchText("");
         $sFormStart = '<form method="POST" name="MainForm">';
--
libgit2 0.21.4