Added search by document type

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1333 c91229c3-7414-0410-bfa2-8a42b809f60b

Added search by document type
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1333 c91229c3-7414-0410-bfa2-8a42b809f60b
rob
1 parent 8b21d2ce
Showing 2 changed files with 35 additions and 52 deletions
presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php
presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
@@ -71,7 +71,7 @@ if (checkSession()) {
 			case "documentType" :
 							//user was browsing by document type - search all documents in that doc type
-							if (!$fDocumentTypeID) {
+							if (!$fDocTypeID) {
 								//no document type specified, so just start at the root folder
 								$fFolderID = 0;
 								$sFolderString = getApprovedFolderString($fFolderID);
@@ -81,7 +81,12 @@ if (checkSession()) {
                                 $main->setCentralPayload($oPatternCustom);
                                 $main->render();			
 							} else {
-								//TODO ONCE DOC TYPE/FOLDERS HAVE BEEN CHANGED
+								$sDocumentString = getApprovedDocsDocType($fDocTypeID);
+								require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+								$oPatternCustom = & new PatternCustom();
+                                $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sDocumentString, $fStartIndex, getSQLSearchString($fStandardSearchString), true));
+                                $main->setCentralPayload($oPatternCustom);
+                                $main->render();								
 							}
 							break;
 			default:
@@ -118,16 +123,6 @@ if (checkSession()) {
 		}
 }
-
-function searchByFolder($iFolderID, $sSearchText) {
-	global $default;
-	//get a list of documents in the folder
-	//TODO - CHECK THAT USER HAS READ RIGHTS TO THIS FOLDER
-	echo getSearchByFolderPage($iFolderID, $sSearchText);
-	
-	
-}
-
 function getApprovedFolderString($iFolderID) {
 	$aChildren = Folder::getChildren($iFolderID);								
 	$aApprovedChildren = array();
@@ -231,13 +226,24 @@ function searchByCategory($sCategoryName) {
 }
-function searchByDocType($iDocTypeID) {
+function getApprovedDocsDocType($iDocTypeID) {
+	global $default;
+	$sQuery = "SELECT D.id " . 
+			"FROM $default->owl_documents_table AS D " .
+			"WHERE D.document_type_id = $iDocTypeID";
+	$sql = $default->db;
+	$sql->query($sQuery);	
+	while ($sql->next_record()) {
+		if (Permission::userHasDocumentReadPermission($sql->f("id"))) {					
+			$aDocuments[count($aDocuments)] = $sql->f("id");
+		}
+		if (count($aDocuments) > 0) {
+			return implode(",", $aDocuments);
+		}
+	}
+	return "0";
 }
-
-
-
-
 ?>
@@ -8,47 +8,24 @@
 * @package presentation.lookAndFeel.documentmanagement
 */
-function getSearchByFolderPage($iFolderID, $sSearchText) {
-	global $default;
-	//get the individual words in the search text
-	$aSearchWords = explode(" ", $sSearchText);
-	$sQuery = "SELECT D.id, D.name, COUNT(D.id) AS cnt " .
-			"FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_words_table AS DWL ON DWL.document_id = D.ID " .
-			"INNER JOIN $default->owl_words_table AS WLU ON WLU.id = DWL.word_id" .
-			"WHERE D.folderID = $iFolderID " .
-			"AND WLU.word IN (";
-	for ($i = 0; $i < count($aSearchWords) -1; $i++) {
-		$sQuery .= $aSearchWords[$i] . ", ";
-	}
-	$sQuery .= $aSearchWords[count($aSearchWords) -1] . ") " .
-			"GROUP BY D.id, D.name " .
-			"ORDER BY D.name, cnt DESC";
-	
-	$aColums = array("name");
-	$aColumnTypes = array(3);
-	$aColumnHeaders = array("Document Name");
-	$aLinkURLs = array("$default->owl_root_url/control.php?action=viewDocument");
-	$aTmpDBQueryStringColumns = array("id");
-	$aNewQueryStringVariableNames = array("fDocumentID");
-	
-	$oPatternTableSqlQuery = & PatternBrowseableSearchResults($sQuery, 10, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
-	
-	return $oPatternTableSqlQuery->render();
+function getPage($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType, $sFolderIDs, $iStartIndex, $sSQLSearchString, $bSearchByDocument = false) {
+	return getSearchResults($sFolderIDs, $sSQLSearchString, $iStartIndex, $bSearchByDocument) . getSearchVariablesHtml($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType);
 }
-function getPage($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType, $sFolderIDs, $iStartIndex, $sSQLSearchString) {
-	return getSearchResults($sFolderIDs, $sSQLSearchString, $iStartIndex) . getSearchVariablesHtml($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType);
-}
-
-function getSearchResults($sFolderIDs,$sSQLSearchString, $iStartIndex) {
+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 " .
-			"WHERE F.id IN ($sFolderIDs) " .
-			"AND ($sSQLSearchString)";	
-			"ORDER BY D.name ASC";	
+			"INNER JOIN $default->owl_words_lookup_table AS WL ON WL.id = DWL.word_id ";
+			if ($bSearchByDocument) {
+				$sQuery .= "WHERE D.id IN ($sIDs) ";
+			} else {
+				$sQuery .= "WHERE F.id IN ($sIDs) ";
+			}
+			$sQuery .= "AND ($sSQLSearchString)";	
+			$sQuery .= "ORDER BY D.name ASC";
+	
 	$aColumns = array("folder_image_url", "document_name");
 	$aColumnTypes = array(4,3);
 	$aColumnHeaders = array("","Document");