Peter M. Groen / knowledgetree

Commit 9abfdca7fc1e5327267ab2079772592d6f61b720

Authored by andrew
1 parent 4975d32a

Type: Feature/functionality. 

Description:		The docuement and the parent folder are returned in the search results.
Credit:			Stefano Ciancio


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2820 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
  View file @9abfdca
@@ -98,7 +98,7 @@ function getSearchPage($sSearchString = "", $aMetaTagIDs = array(), $sHeading = @@ -98,7 +98,7 @@ function getSearchPage($sSearchString = "", $aMetaTagIDs = array(), $sHeading =
98 function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex, $sSearchString, $sStatus = "Live") { 98 function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex, $sSearchString, $sStatus = "Live") {
99 global $default; 99 global $default;
100 100
101 - $sQuery = "SELECT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, F.id folder_id, D.id document_id, D.name AS document_name, COUNT(D.id) AS doc_count " . 101 + $sQuery = "SELECT F.name as folder_name, F.id folder_id, D.id document_id, D.name AS document_name, COUNT(D.id) AS doc_count " .
102 "FROM $default->documents_table AS D INNER JOIN $default->folders_table AS F ON D.folder_id = F.id " . 102 "FROM $default->documents_table AS D INNER JOIN $default->folders_table AS F ON D.folder_id = F.id " .
103 "INNER JOIN $default->document_fields_link_table AS DFL ON DFL.document_id = D.id " . 103 "INNER JOIN $default->document_fields_link_table AS DFL ON DFL.document_id = D.id " .
104 "INNER JOIN $default->document_fields_table AS DF ON DF.id = DFL.document_field_id " . 104 "INNER JOIN $default->document_fields_table AS DF ON DF.id = DFL.document_field_id " .
@@ -111,9 +111,9 @@ function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex, $sSearc @@ -111,9 +111,9 @@ function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex, $sSearc
111 "GROUP BY D.id " . 111 "GROUP BY D.id " .
112 "ORDER BY doc_count DESC "; 112 "ORDER BY doc_count DESC ";
113 $default->log->info("getSearchResults $sQuery"); 113 $default->log->info("getSearchResults $sQuery");
114 - $aColumns = array("folder_image_url", "document_name", "doc_count");  
115 - $aColumnTypes = array(4,3,1);  
116 - $aColumnHeaders = array("<font color=\"ffffff\">Folder</font>","<font color=\"ffffff\">Document</font>", "<font color=\"ffffff\">Matches</font>"); 114 + $aColumns = array("folder_name", "document_name", "doc_count");
  115 + $aColumnTypes = array(3,3,1);
  116 + $aColumnHeaders = array("<font color=\"ffffff\"><img src=$default->graphicsUrl/widgets/dfolder.gif> Folder</font>","<font color=\"ffffff\">Document</font>", "<font color=\"ffffff\">Matches</font>");
117 $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument"); 117 $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument");
118 $aDBQueryStringColumns = array("document_id","folder_id"); 118 $aDBQueryStringColumns = array("document_id","folder_id");
119 $aQueryStringVariableNames = array("fDocumentID", "fFolderID"); 119 $aQueryStringVariableNames = array("fDocumentID", "fFolderID");
@@ -159,4 +159,4 @@ function getSearchVariablesHtml($sSearchText, $sStatus, $sMetaTagIDs) { @@ -159,4 +159,4 @@ function getSearchVariablesHtml($sSearchText, $sStatus, $sMetaTagIDs) {
159 $sToRender .= "<input type=\"hidden\" name=\"adv_search_end\" value=\"\" />\n"; 159 $sToRender .= "<input type=\"hidden\" name=\"adv_search_end\" value=\"\" />\n";
160 return $sToRender; 160 return $sToRender;
161 } 161 }
162 -?>  
163 \ No newline at end of file 162 \ No newline at end of file
  163 +?>