Peter M. Groen / knowledgetree

Commit 54a53accbea1c1002967e89dbee8da9107c1ba27

Authored by Neil Blakey-Milner
1 parent 8ff49b54

If no parameters were made to the search, say so, and don't do a search. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3256 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 11 additions and 3 deletions
presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
  View file @54a53ac
@@ -44,6 +44,9 @@ function criteriaNumber ($var) { @@ -44,6 +44,9 @@ function criteriaNumber ($var) {
44 44
45 function getAdvancedSearchResults($aOrigReq, $iStartIndex) { 45 function getAdvancedSearchResults($aOrigReq, $iStartIndex) {
46 global $default; 46 global $default;
  47 +
  48 + $sRefreshMessage = "<table><tr><td align=\"center\">" . _("If your browser displays a 'Warning: Page has Expired' message when you attempt to return to these search results, please click your browser's 'Refresh' button") . "</td></tr></table>";
  49 +
47 $aReq = array(); 50 $aReq = array();
48 foreach ($aOrigReq as $k => $v) { 51 foreach ($aOrigReq as $k => $v) {
49 if (searchCriteria($k) === 1) { 52 if (searchCriteria($k) === 1) {
@@ -57,6 +60,7 @@ function getAdvancedSearchResults($aOrigReq, $iStartIndex) { @@ -57,6 +60,7 @@ function getAdvancedSearchResults($aOrigReq, $iStartIndex) {
57 $aReq[$k] = $v; 60 $aReq[$k] = $v;
58 } 61 }
59 } 62 }
  63 +
60 $aIDs = array_unique(array_map("criteriaNumber", array_keys($aReq))); 64 $aIDs = array_unique(array_map("criteriaNumber", array_keys($aReq)));
61 $aSQL = array(); 65 $aSQL = array();
62 foreach ($aIDs as $iID) { 66 foreach ($aIDs as $iID) {
@@ -76,6 +80,11 @@ function getAdvancedSearchResults($aOrigReq, $iStartIndex) { @@ -76,6 +80,11 @@ function getAdvancedSearchResults($aOrigReq, $iStartIndex) {
76 $aCritQueries[] = $sSQL; 80 $aCritQueries[] = $sSQL;
77 } 81 }
78 } 82 }
  83 +
  84 + if (count($aCritQueries) == 0) {
  85 + return "No search criteria were specified";
  86 + }
  87 +
79 $sSQLSearchString = join(" AND ", $aCritQueries); 88 $sSQLSearchString = join(" AND ", $aCritQueries);
80 89
81 $sQuery = DBUtil::compactQuery(" 90 $sQuery = DBUtil::compactQuery("
@@ -116,8 +125,7 @@ ORDER BY doc_count DESC&quot;); @@ -116,8 +125,7 @@ ORDER BY doc_count DESC&quot;);
116 $oPatternBrowse->setSearchText(""); 125 $oPatternBrowse->setSearchText("");
117 $oPatternBrowse->setRememberValues($aReq); 126 $oPatternBrowse->setRememberValues($aReq);
118 127
119 - $sRefreshMessage = "<table><tr><td align=\"center\">" . _("If your browser displays a 'Warning: Page has Expired' message when you attempt to return to these search results, please click your browser's 'Refresh' button") . "</td></tr></table>";  
120 - return renderHeading(_("Advanced Search")) . $oPatternBrowse->render() . $sRefreshMessage . getSearchVariablesHtml($sSearchString, $sStatus, $sMetaTagIDs); 128 + return renderHeading(_("Advanced Search")) . $oPatternBrowse->render() . $sRefreshMessage;
121 } 129 }
122 130
123 function dealWithAdvancedSearch($aReq, $iStartIndex) { 131 function dealWithAdvancedSearch($aReq, $iStartIndex) {
@@ -150,7 +158,7 @@ if (checkSession()) { @@ -150,7 +158,7 @@ if (checkSession()) {
150 } else { 158 } else {
151 //display search criteria 159 //display search criteria
152 $oPatternCustom = & new PatternCustom(); 160 $oPatternCustom = & new PatternCustom();
153 - $oPatternCustom->setHtml(getSearchPage($fSearchString)); 161 + $oPatternCustom->setHtml(getSearchPage());
154 $main->setHasRequiredFields(true); 162 $main->setHasRequiredFields(true);
155 $main->setCentralPayload($oPatternCustom); 163 $main->setCentralPayload($oPatternCustom);
156 $main->setFormAction($_SERVER["PHP_SELF"] . "?fForSearch=1"); 164 $main->setFormAction($_SERVER["PHP_SELF"] . "?fForSearch=1");