Add complex boolean search ability - being able to search for this group

of things and/or this group of things. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3906 c91229c3-7414-0410-bfa2-8a42b809f60b

Add complex boolean search ability - being able to search for this group
of things and/or this group of things. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3906 c91229c3-7414-0410-bfa2-8a42b809f60b
nbm
1 parent eaa69e2a
Showing 3 changed files with 125 additions and 30 deletions
presentation/lookAndFeel/knowledgeTree/js/constructed_search.js
presentation/lookAndFeel/knowledgeTree/search/booleanSearch.php
templates/ktcore/boolean_search.smarty
@@ -19,6 +19,22 @@ function removeFromElementEvent(elem, event_name, func) {
     }
 }
+var booleanGroups = Array();
+
+function getBooleanGroupId(table) {
+    for (var i=0; i<booleanGroups.length; i++) {
+        if (booleanGroups[i] == table) {
+            return i;
+        }
+    }
+    // nothing found.
+    simpleLog('DEBUG','no entry found for table.');
+    booleanGroups.push(table);
+    simpleLog('DEBUG','added entry at '+(booleanGroups.length-1));    
+    return booleanGroups.length-1; // int loc.
+}
+
+
 // quick and dirty helper - find the nearest parent item matching tagName. 
 // FIXME steal the klass or tagName logic from MochiK.
 function breadcrumbFind(elem, tagName) {
@@ -41,7 +57,9 @@ var autoIndexCriteria = Array();
 // initiate the criteria creation process.
 function addNewCriteria(add_button) {
     var parent_row = breadcrumbFind(add_button, 'TR');
+    var parent_table = breadcrumbFind(parent_row, 'TABLE');
     simpleLog('DEBUG','addNewCriteria found parent row: '+parent_row);
+    simpleLog('DEBUG','addNewCriteria found parent table: '+parent_table);
     var select_source = parent_row.getElementsByTagName('select');
     if (select_source.length == 0) {
         simpleLog('ERROR','addNewCriteria found no criteria specification source.: '+parent_row);
@@ -59,12 +77,15 @@ function addNewCriteria(add_button) {
     // make this one identifiable.
     autoIndexCriteria.push(0);
     var critId = autoIndexCriteria.length;
+    
+    var tableId = getBooleanGroupId(parent_table);
+    simpleLog('DEBUG','got boolean group id'+tableId);
     // 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['+critId+'][type]','value':select.value}));           // works thanks to DOM co-ercion.
-    createAdditionalCriteriaOption();
+    replaceChildNodes(select.parentNode, newCriteriaText, INPUT({'type':'hidden', 'name':'boolean_search['+tableId+']['+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));
     add_button.parentNode.replaceChild(removeButton, add_button);
@@ -76,7 +97,7 @@ function addNewCriteria(add_button) {
     simpleLog('DEBUG','addNewCriteria initiating request to: '+targeturl);
     var deferred = doSimpleXMLHttpRequest(targeturl); 
-    deferred.addCallbacks(partial(do_addNewCriteria, dest_cell, critId), handleAjaxError);
+    deferred.addCallbacks(partial(do_addNewCriteria, dest_cell, critId, tableId), handleAjaxError);
 }
@@ -84,7 +105,7 @@ function addNewCriteria(add_button) {
 //          - check for the presence of [ or ].  if so, use everything before [ as
 //            the key, and append everything after [.
 // actually replace the contents of the specified td with the responseText.
-function do_addNewCriteria(destination_cell, crit_id, req) { 
+function do_addNewCriteria(destination_cell, crit_id, table_id, req) { 
     simpleLog('DEBUG','replacing content of cell with: \n'+req.responseText);
     destination_cell.innerHTML = req.responseText; 
     // whatever was passed in almost certainly has the wrong name, but that's what
@@ -96,11 +117,11 @@ function do_addNewCriteria(destination_cell, crit_id, req) {
     for (var i=0; i<inputs.length; i++) {
         var obj = inputs[i];
-        obj.name = "boolean_search["+crit_id+"][data]["+obj.name+"]";
+        obj.name = "boolean_search["+table_id+"]["+crit_id+"][data]["+obj.name+"]";
     }
     for (var i=0; i<selects.length; i++) {
         var obj = selects[i];
-        obj.name = "boolean_search["+crit_id+"][data]["+obj.name+"]";
+        obj.name = "boolean_search["+table_id+"]["+crit_id+"][data]["+obj.name+"]";
     }
     simpleLog('DEBUG','criteria addition complete.');
 }
@@ -119,8 +140,8 @@ function removeCriteria(removeButton) {
     simpleLog('DEBUG','criteria removed.');
 }
-function createAdditionalCriteriaOption() {
-    var tbody = getSearchContainer();
+function createAdditionalCriteriaOption(parent_table) {
+    var tbody = getSearchContainer(parent_table);
     if (tbody == null) {
         simpleLog('ERROR','createAdditionalCriteriaOption: No criteria table found.');
         return null;        
@@ -144,8 +165,8 @@ function createAdditionalCriteriaOption() {
     tbody.appendChild(TR(null, select_entry, notification_entry, add_entry));
 }
-function getSearchContainer() {
-    var container = getElement('advanced-search-form');
+function getSearchContainer(parent_table) {
+    var container = parent_table;
     if (container == null) {
         simpleLog('ERROR','No criteria table found.');
         return null;
@@ -163,3 +184,48 @@ function getSearchContainer() {
     return container;
 }
+// uses addbutton to insertBefore
+function addBooleanGroup(addbutton) {
+    bodyObj = addbutton.parentNode;
+    simpleLog('DEBUG','adding boolean group to '+bodyObj);
+
+    // i hate me.  i also want sane multiline
+    sourceString = ' <fieldset> <legend>Criteria Group</legend> <table class="advanced-search-form"> <tbody> <tr> <th>Criteria</th> <th>Values</th> </tr></tbody></table> </fieldset>';
+
+    
+    // add the fieldset
+    var t = DIV(null);
+    t.innerHTML = sourceString; // urgh.
+    var fieldsetObj = t.getElementsByTagName('FIELDSET')[0];
+    bodyObj.insertBefore(fieldsetObj, addbutton);
+    tableObj = fieldsetObj.getElementsByTagName('TABLE')[0];
+    // get an id for the table.
+    var table_id = getBooleanGroupId(tableObj);
+    // add the grouping string
+    groupingString = '<p class="helpText">Return items which match &nbsp;<select name="boolean_condition['+table_id+']"><option value="AND">all</option><option value="OR">any</option></select> of the criteria specified.</p>';    
+    t = DIV(null);
+    t.innerHTML = groupingString;
+    var paraObj = t.getElementsByTagName('P')[0];
+    fieldsetObj.insertBefore(paraObj, tableObj);
+    
+    // add a basic item to the table.
+    createAdditionalCriteriaOption(tableObj);
+    // done.
+    simpleLog('DEBUG','done adding boolean group.');
+}
+
+// FIXME do we want a "remove boolean group" setting?
+// FIXME yes, and its easy (find parent, find ITS parent, toast.)
+function initialiseChecks() {
+   
+    var initialTables = getElementsByTagAndClassName('TABLE','advanced-search-form');
+    simpleLog('DEBUG','initialising '+initialTables.length+' criteria groups.');
+    var t = TABLE(null);
+    for (var i=0; i<initialTables.length; i++) {
+        if (typeof(initialTables[i]) == typeof(t)) {
+            getBooleanGroupId(initialTables[i]);
+        }
+    } 
+}
+
+addLoadEvent(initialiseChecks);
@@ -48,7 +48,7 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
         // TODO finally return via PatternBrowseableSearchResults (urgh.)
         $datavars = KTUtil::arrayGet($_REQUEST, 'boolean_search');
-        $booleanJoinName = KTUtil::arrayGet($_REQUEST, 'boolean_condition');
+        $booleanJoinName = KTUtil::arrayGet($_REQUEST, 'outer_boolean_condition');
         if (empty($datavars)) {
             $this->errorRedirectToMain('You need to have at least 1 condition.');
@@ -59,23 +59,24 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
         // Step 1:  extract the criteria selection, and create an array of criteria.
         $criteria_set = array();
-        foreach ($datavars as $order => $dataset) {
-            $oCriterion = Criteria::getCriterionByNumber($dataset["type"]);             
-            if (PEAR::isError($oCriterion)) {
-                $this->errorRedirectToMain('Invalid criteria specified.');
+        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"]);
             }
-            $criteria_set[] = array($oCriterion, $dataset["data"]);
         }
-        $res = $this->handleCriteriaSet($criteria_set, $booleanJoinName);
+        $res = $this->handleCriteriaSet($criteria_set, $booleanJoinName, $_REQUEST['boolean_condition']);
         return $res;
     }
-    
-    function handleCriteriaSet($aCriteriaSet, $mergeType='AND') {
-		global $default;
-		$aSQL = array();
-		$aJoinSQL = array();
-		foreach ($aCriteriaSet as $oCriterionPair) {
+
+    function _oneCriteriaSetToSQL($aOneCriteriaSet) {
+        $aSQL = array();
+        $aJoinSQL = array();
+		foreach ($aOneCriteriaSet as $oCriterionPair) {
 		    $oCriterion = $oCriterionPair[0];
 			$aReq = $oCriterionPair[1];
 			$res = $oCriterion->searchSQL($aReq);
@@ -104,8 +105,27 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
 			exit(0);
 		}
-		$sSQLSearchString = join("\n ".$mergeType." ", $aCritQueries);
+        return array($aCritQueries, $aCritParams, $aJoinSQL);
+    }
+
+    function criteriaSetToSQL($aCriteriaSet, $mergeType='AND', $innerMergeTypes = null) {
+        $aJoinSQL = array();
+        $aSearchStrings = array();
+        $aParams = array();
+        foreach ($aCriteriaSet as $k => $aOneCriteriaSet) {
+            list($aThisCritQueries, $aThisParams, $aThisJoinSQL) = $this->_oneCriteriaSetToSQL($aOneCriteriaSet);
+            $aJoinSQL = array_merge($aJoinSQL, $aThisJoinSQL);
+            $aParams = array_merge($aParams, $aThisParams);
+            $aSearchStrings[] = "\n\t\t(\n\t\t\t" . join("\n " . KTUtil::arrayGet($innerMergeTypes, $k, "AND") . " ", $aThisCritQueries) . "\n\t\t)";
+        }
 		$sJoinSQL = join(" ", $aJoinSQL);
+		$sSearchString = "\n\t(" . join("\n\t\t" . $mergeType . " ", $aSearchStrings) .  "\n\t)";
+        return array($sSearchString, $aParams, $sJoinSQL);
+    }
+    
+    function handleCriteriaSet($aCriteriaSet, $mergeType='AND', $innerMergeTypes = null) {
+		global $default;
+        list($sSQLSearchString, $aCritParams, $sJoinSQL) = $this->criteriaSetToSQL($aCriteriaSet, $mergeType);
 		$sToSearch = KTUtil::arrayGet($aOrigReq, 'fToSearch', 'Live'); // actually never present in this version.
@@ -141,7 +161,7 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
 		$aParams[] = $sToSearch;
 		$aParams = array_merge($aParams, $aCritParams);
-		//'<pre>'.var_dump(DBUtil::getResultArray(array($sQuery, $aParams)));
+		//print '<pre>';var_dump(DBUtil::getResultArray(array($sQuery, $aParams)));
 		//exit(0);
 		//return '<pre>'.print_r(DBUtil::getResultArray(array($sQuery, $aParams)), true).'</pre>';
         $iStartIndex = 1;
@@ -50,12 +50,15 @@ legend { border: 1px dotted #999;}
 <form>
     <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>    
+    
     <fieldset>
-        <legend>Boolean Search.</legend>
+        <legend>Criteria Group</legend>
-        <p class="helpText">Return items which match &nbsp;<select name="boolean_condition"><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_condition[0]"><option value="AND">all</option><option value="OR">any</option></select> of the criteria specified.</p>
-        <table id="advanced-search-form">
+        <table class="advanced-search-form">
             <tbody>
                 <tr>
                 <th>Criteria</th>
@@ -76,8 +79,13 @@ legend { border: 1px dotted #999;}
         </table>
     </fieldset>
-    <input type="submit" name="submit" value="performSearch" />
+    
+    <input type="button" value="add another set of criteria" onclick="addBooleanGroup(this)"/>
+    
+    
+    <input type="submit" name="submit" value="Search" />
 </form>
+
 <!--
 <table id="brad-log" width="100%">
 <thead>
@@ -88,7 +96,8 @@ legend { border: 1px dotted #999;}
     </tr>
 </thead>
 <tbody>
+-->
 </tbody>
 </table>
--->
+