Commit 504f8e1fcf1ff0f8bf83292ee97baeb0773e7e8f
1 parent
7c98a904
removed unnecessary code
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2046 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
12 additions
and
4 deletions
presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
| ... | ... | @@ -25,15 +25,23 @@ if (checkSession()) { |
| 25 | 25 | |
| 26 | 26 | require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); |
| 27 | 27 | |
| 28 | - if (strlen($fSearchString) > 0) { | |
| 28 | + if (strlen($fForSearch)) { | |
| 29 | 29 | if (strlen($fSearchString) > 0) { |
| 30 | 30 | //display search results |
| 31 | 31 | $sMetaTagIDs = getChosenMetaDataTags(); |
| 32 | 32 | |
| 33 | 33 | if (strlen($sMetaTagIDs) > 0) { |
| 34 | 34 | $sSQLSearchString = getSQLSearchString($fSearchString); |
| 35 | - $sDocument = getApprovedDocumentString($sMetaTagIDs, $sSQLSearchString, (isset($fSearchArchive) ? "Archived" : "Live")); | |
| 36 | - if (strlen($sDocument) > 0) { | |
| 35 | + | |
| 36 | + if (!isset($fStartIndex)) { | |
| 37 | + $fStartIndex = 0; | |
| 38 | + } | |
| 39 | + | |
| 40 | + $oPatternCustom->setHtml(getSearchResults($sMetaTagIDs,$sSQLSearchString, $fStartIndex)); | |
| 41 | + $main->setCentralPayload($oPatternCustom); | |
| 42 | + $main->render(); | |
| 43 | + //$sDocument = getApprovedDocumentString($sMetaTagIDs, $sSQLSearchString, (isset($fSearchArchive) ? "Archived" : "Live")); | |
| 44 | + /*if (strlen($sDocument) > 0) { | |
| 37 | 45 | //if there are documents to view |
| 38 | 46 | $oPatternCustom = & new PatternCustom(); |
| 39 | 47 | if (!isset($fStartIndex)) { |
| ... | ... | @@ -49,7 +57,7 @@ if (checkSession()) { |
| 49 | 57 | $main->setErrorMessage("No documents matched your search criteria"); |
| 50 | 58 | $main->setFormAction("advancedSearchBL.php?fForSearch=1"); |
| 51 | 59 | $main->render(); |
| 52 | - } | |
| 60 | + }*/ | |
| 53 | 61 | |
| 54 | 62 | } else { |
| 55 | 63 | $oPatternCustom = & new PatternCustom(); | ... | ... |