From a3a51d1daa692ed75245519ae5eb1502fc059d4b Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 1 Jul 2003 10:44:56 +0000 Subject: [PATCH] aliased table names and fixed search by category query --- presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc index bda5214..02ff15f 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc @@ -20,11 +20,12 @@ function getMessage() { function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCategory) { 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, ROUND(MATCH(DT.document_text) AGAINST ('" . $sKeywords . "'),3) AS score " . - "FROM documents AS D INNER JOIN document_text AS DT ON D.id = DT.document_id " . + "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_text_table AS DT ON D.id = DT.document_id " . + "INNER JOIN $default->owl_document_fields_table AS DFL ON DT.document_id=DFL.document_id " . "INNER JOIN $default->owl_fields_table AS DF ON DF.id = DFL.document_field_id " . - "INNER JOIN status_lookup AS SL ON D.status_id = SL.id " . - "INNER JOIN folders AS F on F.ID = D.folder_id " . - "INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.id " . + "INNER JOIN $default->owl_status_table AS SL ON D.status_id = SL.id " . + "INNER JOIN $default->owl_folders_table AS F on F.ID = D.folder_id " . + "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " . "WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " . "AND SDUL.user_id = " . $_SESSION["userID"] . " " . "AND SL.name='Live' "; @@ -57,10 +58,10 @@ function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCate function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $iDocTypeID) { 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, ROUND(MATCH(DT.document_text) AGAINST ('" . $sKeywords . "'),3) AS score " . - "FROM documents AS D INNER JOIN document_text AS DT ON D.id = DT.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 " . - "INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.id " . + "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_text_table AS DT ON D.id = DT.document_id " . + "INNER JOIN $default->owl_status_table AS SL ON D.status_id = SL.id " . + "INNER JOIN $default->owl_folders_table AS F on F.ID = D.folder_id " . + "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " . "WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " . "AND SDUL.user_id = " . $_SESSION["userID"] . " "; if (isset($iDocTypeID)) { @@ -92,10 +93,10 @@ function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $i function getSeachResultsByFolder($iFolderID, $iStartIndex, $sKeywords) { 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, ROUND(MATCH(DT.document_text) AGAINST ('" . $sKeywords . "'),3) AS score " . - "FROM documents AS D INNER JOIN document_text AS DT ON D.id = DT.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 " . - "INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.id " . + "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_text_table AS DT ON D.id = DT.document_id " . + "INNER JOIN $default->owl_status_table AS SL ON D.status_id = SL.id " . + "INNER JOIN $default->owl_folders_table AS F on F.ID = D.folder_id " . + "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " . "WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " . "AND SDUL.user_id = " . $_SESSION["userID"] . " " . "AND SL.name='Live' "; -- libgit2 0.21.4