Peter M. Groen / knowledgetree

Commit 6add518ed04959a0cb83f43bb16a99baf782aff5

Authored by Neil Blakey-Milner
1 parent 70e9514b

Change to using criteriaToLegacyQuery that returns something other than 

just document id.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3958 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 6 additions and 5 deletions
presentation/lookAndFeel/knowledgeTree/search/booleanSearch.php
  View file @6add518
... ... @@ -69,11 +69,12 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
69 69 }
70 70  
71 71 function handleCriteriaSet($aCriteriaSet, $iStartIndex) {
72   - $aQuery = KTSearchUtil::criteriaToQuery($aCriteriaSet, $_SESSION['userID'], 'ktcore.permissions.read');
73   - $aColumns = array("folder_name", "file_name", "document_name", "doc_count", "view");
74   - $aColumnTypes = array(3,3,3,1,3);
75   - $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>");
76   - $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument", "$default->rootUrl/control.php?action=viewDocument", null, "$default->rootUrl/control.php?action=downloadDocument");
  72 + global $default;
  73 + $aQuery = KTSearchUtil::criteriaToLegacyQuery($aCriteriaSet, $_SESSION['userID'], 'ktcore.permissions.read');
  74 + $aColumns = array("folder_name", "file_name", "document_name", "view");
  75 + $aColumnTypes = array(3,3,3,3);
  76 + $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\">" . _("View") . "</font>");
  77 + $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument", "$default->rootUrl/control.php?action=viewDocument", "$default->rootUrl/control.php?action=downloadDocument");
77 78 $aDBQueryStringColumns = array("document_id","folder_id");
78 79 $aQueryStringVariableNames = array("fDocumentID", "fFolderID");
79 80  
... ...