Bring the outer boolean into the boolean_search array, and finish the

pagination in the boolean search. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3911 c91229c3-7414-0410-bfa2-8a42b809f60b

Bring the outer boolean into the boolean_search array, and finish the
pagination in the boolean search. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3911 c91229c3-7414-0410-bfa2-8a42b809f60b
Neil Blakey-Milner
1 parent dc08c0a0
Showing 3 changed files with 22 additions and 32 deletions
presentation/lookAndFeel/knowledgeTree/js/constructed_search.js
presentation/lookAndFeel/knowledgeTree/search/booleanSearch.php
templates/ktcore/boolean_search.smarty
@@ -84,7 +84,7 @@ function addNewCriteria(add_button) {
     // ok, warn the user that we're loading the item.
     replaceChildNodes(notify_message, 'loading...');
     var newCriteriaText = scrapeText(select.options[select.selectedIndex])+' '; // FIXME insert the "input" here.
-    replaceChildNodes(select.parentNode, newCriteriaText, INPUT({'type':'hidden', 'name':'boolean_search['+tableId+'][values]['+critId+'][type]','value':select.value}));           // works thanks to DOM co-ercion.
+    replaceChildNodes(select.parentNode, newCriteriaText, INPUT({'type':'hidden', 'name':'boolean_search[subgroup]['+tableId+'][values]['+critId+'][type]','value':select.value}));           // works thanks to DOM co-ercion.
     createAdditionalCriteriaOption(parent_table);
     var removeButton = INPUT({'type':'button', 'value':'Remove'});
     attachToElementEvent(removeButton, 'click', partial(removeCriteria, removeButton));
@@ -117,11 +117,11 @@ function do_addNewCriteria(destination_cell, crit_id, table_id, req) {
     for (var i=0; i<inputs.length; i++) {
         var obj = inputs[i];
-        obj.name = "boolean_search["+table_id+"][values]["+crit_id+"][data]["+obj.name+"]";
+        obj.name = "boolean_search[subgroup]["+table_id+"][values]["+crit_id+"][data]["+obj.name+"]";
     }
     for (var i=0; i<selects.length; i++) {
         var obj = selects[i];
-        obj.name = "boolean_search["+table_id+"][values]["+crit_id+"][data]["+obj.name+"]";
+        obj.name = "boolean_search[subgroup]["+table_id+"][values]["+crit_id+"][data]["+obj.name+"]";
     }
     simpleLog('DEBUG','criteria addition complete.');
 }
@@ -48,27 +48,15 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
         // TODO finally return via PatternBrowseableSearchResults (urgh.)
         $datavars = KTUtil::arrayGet($_REQUEST, 'boolean_search');
-        $booleanJoinName = KTUtil::arrayGet($_REQUEST, 'outer_boolean_condition');
+        if (!is_array($datavars)) {
+            $datavars = unserialize($datavars);
+        }
         if (empty($datavars)) {
             $this->errorRedirectToMain('You need to have at least 1 condition.');
         }
-        if (empty($booleanJoinName)) {
-             $this->errorRedirectToMain('You need to specify which kind of search (ALL/ANY) you wish to perform.');
-        }
-        // Step 1:  extract the criteria selection, and create an array of criteria.
-        $criteria_set = array();
-        foreach (array_keys($datavars) as $k) {
-            foreach ($datavars[$k] as $order => $dataset) {
-                $oCriterion = Criteria::getCriterionByNumber($dataset["type"]);             
-                if (PEAR::isError($oCriterion)) {
-                    $this->errorRedirectToMain('Invalid criteria specified.');
-                }
-                $criteria_set[$k][] = array($oCriterion, $dataset["data"]);
-            }
-        }
-        $res = $this->handleCriteriaSet($datavars, $booleanJoinName);
+        $res = $this->handleCriteriaSet($datavars, KTUtil::arrayGet($_REQUEST, 'fStartIndex', 1));
         return $res;
     }
@@ -116,11 +104,11 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
         return array($aCritQueries, $aCritParams, $aJoinSQL);
     }
-    function criteriaSetToSQL($aCriteriaSet, $sMergeType = "AND") {
+    function criteriaSetToSQL($aCriteriaSet) {
         $aJoinSQL = array();
         $aSearchStrings = array();
         $aParams = array();
-        foreach ($aCriteriaSet as $k => $aOneCriteriaSet) {
+        foreach ($aCriteriaSet["subgroup"] as $k => $aOneCriteriaSet) {
             if (is_null($aOneCriteriaSet["values"])) {
                 continue;
             }
@@ -130,13 +118,13 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
             $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" . $sMergeType . " ", $aSearchStrings) .  "\n\t)";
+		$sSearchString = "\n\t(" . join("\n\t\t" . $aCriteriaSet['join'] . " ", $aSearchStrings) .  "\n\t)";
         return array($sSearchString, $aParams, $sJoinSQL);
     }
-    function handleCriteriaSet($aCriteriaSet, $sMergeType = "AND") {
+    function handleCriteriaSet($aCriteriaSet, $iStartIndex) {
 		global $default;
-        list($sSQLSearchString, $aCritParams, $sJoinSQL) = $this->criteriaSetToSQL($aCriteriaSet, $sMergeType);
+        list($sSQLSearchString, $aCritParams, $sJoinSQL) = $this->criteriaSetToSQL($aCriteriaSet);
 		$sToSearch = KTUtil::arrayGet($aOrigReq, 'fToSearch', 'Live'); // actually never present in this version.
@@ -175,8 +163,6 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
 		//print '<pre>';var_dump(DBUtil::getResultArray(array($sQuery, $aParams)));
 		//exit(0);
 		//return '<pre>'.print_r(DBUtil::getResultArray(array($sQuery, $aParams)), true).'</pre>';
-        $iStartIndex = 1;
-	
 		$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>");
@@ -187,9 +173,12 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
 		$oPatternBrowse = & new PatternBrowseableSearchResults(array($sQuery, $aParams), 10, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
 		$oPatternBrowse->setStartIndex($iStartIndex);
 		$oPatternBrowse->setSearchText("");
-		$sForSearch = "<input type=\"hidden\" name=\"fForSearch\" value=\"1\" />";
-	
-		return renderHeading(_("Advanced Search")) . $oPatternBrowse->render() . $sForSearch . $sRefreshMessage;
+        $sFormStart = '<form method="POST" name="MainForm">';
+
+		$sFormEnd = '<input type="hidden" name="boolean_search" value="'. htmlentities(serialize($aCriteriaSet)) . '" />';
+		$sFormEnd .= '<input type="hidden" name="action" value="performSearch" />';
+
+		return renderHeading(_("Advanced Search")) . $sFormStart . $oPatternBrowse->render() . $sFormEnd . $sRefreshMessage;
     }
 }
@@ -48,15 +48,16 @@ legend { border: 1px dotted #999;}
 <h2>Boolean Search</h2>
-<form>
+<form method="POST">
     <input type="hidden" name="action" value="performSearch" />
-   <p class="helpText">Return items which match &nbsp;<select name="outer_boolean_condition"><option value="AND">all</option><option value="OR">any</option></select> of the <strong>criteria groups</strong> specified.</p>    
+   <p class="helpText">Return items which match &nbsp;<select
+name="boolean_search[join]"><option value="AND">all</option><option value="OR">any</option></select> of the <strong>criteria groups</strong> specified.</p>    
     <fieldset>
         <legend>Criteria Group</legend>
-        <p class="helpText">Return items which match &nbsp;<select name="boolean_search[0][join]"><option value="AND">all</option><option value="OR">any</option></select> of the criteria specified.</p>
+        <p class="helpText">Return items which match &nbsp;<select name="boolean_search[subgroup][0][join]"><option value="AND">all</option><option value="OR">any</option></select> of the criteria specified.</p>
         <table class="advanced-search-form">
             <tbody>