diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc index f4b187a..ee565b6 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc @@ -98,7 +98,7 @@ function getSearchPage($sSearchString = "", $aMetaTagIDs = array(), $sHeading = function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex, $sSearchString, $sStatus = "Live") { global $default; - $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 " . + $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 " . "FROM $default->documents_table AS D INNER JOIN $default->folders_table AS F ON D.folder_id = F.id " . "INNER JOIN $default->document_fields_link_table AS DFL ON DFL.document_id = D.id " . "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 "GROUP BY D.id " . "ORDER BY doc_count DESC "; $default->log->info("getSearchResults $sQuery"); - $aColumns = array("folder_image_url", "document_name", "doc_count"); - $aColumnTypes = array(4,3,1); - $aColumnHeaders = array("Folder","Document", "Matches"); + $aColumns = array("folder_name", "document_name", "doc_count"); + $aColumnTypes = array(3,3,1); + $aColumnHeaders = array("graphicsUrl/widgets/dfolder.gif> Folder","Document", "Matches"); $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument"); $aDBQueryStringColumns = array("document_id","folder_id"); $aQueryStringVariableNames = array("fDocumentID", "fFolderID"); @@ -159,4 +159,4 @@ function getSearchVariablesHtml($sSearchText, $sStatus, $sMetaTagIDs) { $sToRender .= "\n"; return $sToRender; } -?> \ No newline at end of file +?>