diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
index 3390b60..d4f3682 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
@@ -27,6 +27,8 @@ if (checkSession()) {
if (strlen($fForSearch)) {
if (strlen($fSearchString) > 0) {
+ $oPatternCustom = & new PatternCustom();
+
//display search results
$sMetaTagIDs = getChosenMetaDataTags();
@@ -34,33 +36,13 @@ if (checkSession()) {
$sSQLSearchString = getSQLSearchString($fSearchString);
if (!isset($fStartIndex)) {
- $fStartIndex = 0;
- }
-
+ $fStartIndex = 0;
+ }
$oPatternCustom->setHtml(getSearchResults($sMetaTagIDs,$sSQLSearchString, $fStartIndex));
$main->setCentralPayload($oPatternCustom);
$main->render();
- //$sDocument = getApprovedDocumentString($sMetaTagIDs, $sSQLSearchString, (isset($fSearchArchive) ? "Archived" : "Live"));
- /*if (strlen($sDocument) > 0) {
- //if there are documents to view
- $oPatternCustom = & new PatternCustom();
- if (!isset($fStartIndex)) {
- $fStartIndex = 0;
- }
- $oPatternCustom->setHtml(getSearchResults($sMetaTagIDs,$sSQLSearchString, $fStartIndex));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- } else {
- $oPatternCustom = & new PatternCustom();
- $oPatternCustom->setHtml(getSearchPage($fSearchString, explode(",",$sMetaTagIDs)));
- $main->setCentralPayload($oPatternCustom);
- $main->setErrorMessage("No documents matched your search criteria");
- $main->setFormAction("advancedSearchBL.php?fForSearch=1");
- $main->render();
- }*/
-
} else {
- $oPatternCustom = & new PatternCustom();
+
$oPatternCustom->setHtml(getSearchPage($fSearchString));
$main->setCentralPayload($oPatternCustom);
$main->setErrorMessage("Please select at least one criteria to search by");
diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
index 3404a48..7b19909 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
@@ -74,7 +74,7 @@ function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex) {
"ORDER BY doc_count DESC ";
$aColumns = array("folder_image_url", "document_name", "doc_count");
- $aColumnTypes = array(4,3,3);
+ $aColumnTypes = array(4,3,1);
$aColumnHeaders = array("Folder","Document", "Matches");
$aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument");
$aDBQueryStringColumns = array("document_id","folder_id");