Peter M. Groen / knowledgetree

Commit 20eb4eaa432cfa53db21e7feddc5abcba562aa3b

Authored by Neil Blakey-Milner
1 parent bc53c342

No longer handle the removed "simple" "advanced" search. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3190 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 2 additions and 36 deletions
presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
  View file @20eb4ea
... ... @@ -114,6 +114,7 @@ ORDER BY doc_count DESC");
114 114 $oPatternBrowse = & new PatternBrowseableSearchResults(array($sQuery, $aParams), 10, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
115 115 $oPatternBrowse->setStartIndex($iStartIndex);
116 116 $oPatternBrowse->setSearchText("");
  117 + $oPatternBrowse->setRememberValues($aReq);
117 118  
118 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>";
119 120 return renderHeading(_("Advanced Search")) . $oPatternBrowse->render() . $sRefreshMessage . getSearchVariablesHtml($sSearchString, $sStatus, $sMetaTagIDs);
... ... @@ -145,41 +146,7 @@ if (checkSession()) {
145 146 }
146 147  
147 148 if (strlen($fForSearch)) {
148   - if (array_key_exists('advancedSearch_x', $_REQUEST)) {
149   - dealWithAdvancedSearch($_REQUEST, $fStartIndex);
150   - } else if (strlen($fSearchString) > 0) {
151   - $oPatternCustom = & new PatternCustom();
152   -
153   - //display search results
154   - $sMetaTagIDs = getChosenMetaDataTags($_POST);
155   -
156   - if (strlen($sMetaTagIDs) > 0) {
157   - $sSQLSearchString = getSQLSearchString($fSearchString);
158   - $oPatternCustom->setHtml(getSearchResults($sMetaTagIDs, $sSQLSearchString, $fStartIndex, $fSearchString, $fToSearch));
159   - $main->setCentralPayload($oPatternCustom);
160   - $main->render();
161   - } else {
162   - $oPatternCustom->setHtml(getSearchPage($fSearchString));
163   - $main->setCentralPayload($oPatternCustom);
164   - $main->setErrorMessage(_("Please select at least one criteria to search by"));
165   - $main->setHasRequiredFields(true);
166   - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForSearch=1");
167   - $main->setOnLoadJavaScript("switchDiv('" . (isset($fShowSection) ? $fShowSection : "searchLess") . "', 'search')");
168   - $main->render();
169   - }
170   - } else {
171   - $sMetaTagIDs = getChosenMetaDataTags($_POST);
172   - $aMetaTagIDs = explode(",", $sMetaTagIDs);
173   - $oPatternCustom = & new PatternCustom();
174   - $oPatternCustom->setHtml(getSearchPage($fSearchString, $aMetaTagIDs));
175   - $main->setCentralPayload($oPatternCustom);
176   - $main->setErrorMessage(_("Please enter text to search on"));
177   - $main->setHasRequiredFields(true);
178   - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForSearch=1");
179   - $main->setOnLoadJavaScript("switchDiv('" . (isset($fShowSection) ? $fShowSection : "searchLess") . "', 'search')");
180   - $main->render();
181   - }
182   -
  149 + dealWithAdvancedSearch($_REQUEST, $fStartIndex);
183 150 } else {
184 151 //display search criteria
185 152 $oPatternCustom = & new PatternCustom();
... ... @@ -187,7 +154,6 @@ if (checkSession()) {
187 154 $main->setHasRequiredFields(true);
188 155 $main->setCentralPayload($oPatternCustom);
189 156 $main->setFormAction($_SERVER["PHP_SELF"] . "?fForSearch=1");
190   - $main->setOnLoadJavaScript("switchDiv('" . (isset($fShowSection) ? $fShowSection : "searchLess") . "', 'search')");
191 157 $main->render();
192 158 }
193 159 }
... ...