From 9e6f9ad24a58e3ebd631771c67980f60fb768ca5 Mon Sep 17 00:00:00 2001 From: Neil Blakey-Milner Date: Fri, 20 May 2005 23:45:56 +0000 Subject: [PATCH] Use IN BOOLEAN MODE for the search, allowing us to overcome some issues on low document volumes for searching. --- presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc index 1098ce4..25d5b50 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc @@ -36,14 +36,16 @@ function getMessage() { function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCategory) { global $default; - /*ok*/ $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 (?),3) AS score " . + /*ok*/ $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 (? IN BOOLEAN MODE) OR 1, 3) AS score " . "FROM $default->documents_table AS D INNER JOIN $default->document_text_table AS DT ON D.id = DT.document_id " . "INNER JOIN $default->document_fields_link_table AS DFL ON DT.document_id=DFL.document_id " . "INNER JOIN $default->document_fields_table AS DF ON DF.id = DFL.document_field_id " . "INNER JOIN $default->status_table AS SL ON D.status_id = SL.id " . "INNER JOIN $default->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 (?) " . + "WHERE MATCH(DT.document_text) AGAINST (? IN BOOLEAN MODE) " . "AND (F.is_public OR SDUL.user_id = ?) " . "AND SL.name='Live' "; $aParams = array($sKeywords, $sKeywords, $_SESSION["userID"]); @@ -75,12 +77,14 @@ function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCate function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $iDocTypeID) { global $default; - /*ok*/ $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 (?),3) AS score " . + /*ok*/ $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 (? IN BOOLEAN MODE),3) AS score " . "FROM $default->documents_table AS D INNER JOIN $default->document_text_table AS DT ON D.id = DT.document_id " . "INNER JOIN $default->status_table AS SL ON D.status_id = SL.id " . "INNER JOIN $default->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 (?) " . + "WHERE MATCH(DT.document_text) AGAINST (? IN BOOLEAN MODE) " . "AND (F.is_public OR SDUL.user_id = ?) "; $aParams = array($sKeywords, $sKeywords, $_SESSION["userID"]); if (isset($iDocTypeID)) { @@ -112,12 +116,14 @@ function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $i function getSeachResultsByFolder($iFolderID, $iStartIndex, $sKeywords) { global $default; - /*ok*/ $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 (?),3) AS score " . + /*ok*/ $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 (? IN BOOLEAN MODE),3) AS score " . "FROM $default->documents_table AS D INNER JOIN $default->document_text_table AS DT ON D.id = DT.document_id " . "INNER JOIN $default->status_table AS SL ON D.status_id = SL.id " . "INNER JOIN $default->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 (?) " . + "WHERE MATCH(DT.document_text) AGAINST (? IN BOOLEAN MODE) " . "AND (F.is_public OR SDUL.user_id = ?) " . "AND SL.name='Live' "; $aParams = array($sKeywords, $sKeywords, $_SESSION["userID"]); -- libgit2 0.21.4