From ef0ded565b6b73404adde3ecffd1649e1774956a Mon Sep 17 00:00:00 2001
From: Michael Joseph <michael@knowledgetree.com>
Date: Wed, 28 May 2003 11:58:37 +0000
Subject: [PATCH] removed commented out code fixed renderHeading calls only search for live documents

---
 presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc | 60 +++++++++++-------------------------------------------------
 1 file changed, 11 insertions(+), 49 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
index 016cb7b..fd638bd 100644
--- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
@@ -1,67 +1,29 @@
 <?php
-
 /**
-* Presentation functionality used to searchDocumentBL.php
-* 
-* @author Rob Cherry, Jam Warehouse South Africa (Pty) Ltd
-* @date 20 February 2003
-* @package presentation.lookAndFeel.documentmanagement
-*/
-
-/*function renderHeading() {
-    global $default;
-    $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
-    $sColor = $default->siteMap->getSectionColour($sSectionName, "th");
-    $sToRender .= "<tr align=\"left\"><th class=\"sectionHeading\" bgcolor=\"$sColor\"><font color=\"ffffff\">Standard Search</font></th></tr>\n";
-    $sToRender .= "<tr/>\n";
-    $sToRender .= "<tr/>\n";
-    return $sToRender;
-}*/
+ * $Id$
+ *
+ * Presentation functionality used to searchDocumentBL.php
+ * 
+ * @author Rob Cherry, Jam Warehouse South Africa (Pty) Ltd
+ * @date 20 February 2003
+ * @package presentation.lookAndFeel.documentmanagement
+ */
 
 function getPage($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType, $sFolderIDs, $iStartIndex, $sSQLSearchString, $bSearchByDocument = false) {
     $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>";
-    return "<table width=\"600\">" . renderHeading("Standard Search") . "</table>" . getSearchResults($sFolderIDs, $sSQLSearchString, $iStartIndex, $bSearchByDocument) . $sRefreshMessage . getSearchVariablesHtml($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType);
+    return renderHeading("Standard Search") . getSearchResults($sFolderIDs, $sSQLSearchString, $iStartIndex, $bSearchByDocument) . $sRefreshMessage . getSearchVariablesHtml($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType);
 }
 
-/*function getSearchResults($sIDs,$sSQLSearchString, $iStartIndex, $bSearchByDocument = false) {
-	global $default;	 
-	$sQuery = "SELECT DISTINCT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, F.id folder_id, D.id document_id, D.name AS document_name " .
-			"FROM $default->owl_documents_table AS D INNER JOIN $default->owl_folders_table AS F ON D.folder_id = F.id " .
-			"INNER JOIN $default->owl_document_words_table AS DWL ON DWL.document_id = D.id " .
-			"INNER JOIN $default->owl_words_lookup_table AS WL ON WL.id = DWL.word_id ";
-            if (strlen($sIDs) > 0) {
-                if ($bSearchByDocument) {
-                    $sQuery .= "WHERE D.id IN ($sIDs) ";
-                } else {
-                    $sQuery .= "WHERE F.id IN ($sIDs) ";
-                }
-                $sQuery .= "AND ($sSQLSearchString)";
-            } else {
-                $sQuery .= "WHERE ($sSQLSearchString)";
-            }
-				
-			$sQuery .= "ORDER BY D.name ASC";
-	
-	$aColumns = array("folder_image_url", "document_name");
-	$aColumnTypes = array(4,3);
-	$aColumnHeaders = array("<font color=\"ffffff\">Folder</font>","<font color=\"ffffff\">Document</font>");
-	$aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument");
-	$aDBQueryStringColumns = array("document_id","folder_id");
-	$aQueryStringVariableNames = array("fDocumentID", "fFolderID");
-	
-	$oPatternBrowse = & new PatternBrowseableSearchResults($sQuery, 10, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
-	$oPatternBrowse->setStartIndex($iStartIndex);
-	return $oPatternBrowse->render();
-}*/
-
 function getSearchResults($sFolderIDs, $sKeywords, $iStartIndex) {
 	global $default;
 	$sQuery = "SELECT DISTINCT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, F.id AS folder_id, D.id AS document_id, D.name AS document_name, MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') AS score " . 
 				"FROM search_document_user_link AS SDUL INNER JOIN document_text AS DT ON SDUL.document_id = DT.document_id " .
 				"INNER JOIN documents AS D ON D.id = SDUL.document_id " .
+				"INNER JOIN status_lookup AS SL ON D.status_id = SL.id " .
 				"INNER JOIN folders AS F on F.ID = D.folder_id " .
 				"WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " .
 				"AND SDUL.user_id = " . $_SESSION["userID"] . " " .
+				"AND SL.name='Live' " . 
 				"AND F.id IN ($sFolderIDs) " .
 				"ORDER BY score DESC";
 	
--
libgit2 0.21.4