From e51a0c082e289f62b24b659085cf241425ef55f6 Mon Sep 17 00:00:00 2001
From: rob <rob@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Thu, 27 Feb 2003 07:52:59 +0000
Subject: [PATCH] Added check for no search results

---
 presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php | 33 +++++++++++++++++++++++++--------
 presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc |  2 +-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
index f2ed052..7819e95 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
@@ -30,13 +30,23 @@ if (checkSession()) {
 			if (strlen($sMetaTagIDs) > 0) {
 				$sSQLSearchString = getSQLSearchString($fSearchString);
 				$sDocument = getApprovedDocumentString($sMetaTagIDs, $sSQLSearchString);
-				$oPatternCustom = & new PatternCustom();
-				if (!isset($fStartIndex)) {
-					$fStartIndex = 0;
+				if (strlen($sDocument) > 0) {
+					//if there are documents to view					
+					$oPatternCustom = & new PatternCustom();
+					if (!isset($fStartIndex)) {
+						$fStartIndex = 0;
+					}
+					$oPatternCustom->setHtml(getSearchResults($sDocument,$fStartIndex, $fSearchString, $sMetaTagIDs));
+					$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();
 				}
-				$oPatternCustom->setHtml(getSearchResults($sDocument,$fStartIndex, $fSearchString, $sMetaTagIDs));
-				$main->setCentralPayload($oPatternCustom);				                                
-				$main->render();
 				
 			} else {
 				$oPatternCustom = & new PatternCustom();
@@ -86,7 +96,10 @@ function getChosenMetaDataTags() {
 			
 		}
 	}
-	return implode(",",$aTagIDs);
+	if (count($aTagIDs) > 1) {
+		return implode(",",$aTagIDs);
+	}
+	return $aTagIDs[0];
 }
 
 /**
@@ -109,7 +122,11 @@ function getApprovedDocumentString($sMetaTagIDs, $sSQLSearchString) {
 				$aApprovedDocuments[count($aApprovedDocuments)] = $sql->f("id");
 		}
 	}
-	return implode(",",$aApprovedDocuments);	
+	if (count($aApprovedDocuments) > 1) {
+		return implode(",",$aApprovedDocuments);
+	}
+	return $aApprovedDocuments[0];
+
 }
 
 /*
diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
index b5fc46c..a83747e 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
@@ -10,7 +10,7 @@
 */
 
 function getMetaData($aMetaTagIDs) {
-	global $default;
+	global $default;	
 	$sQuery = "SELECT name, id FROM $default->owl_fields_table ORDER BY name ASC";
 	
 	$sql = $default->db;
--
libgit2 0.21.4