Peter M. Groen / knowledgetree

Commit a3a51d1daa692ed75245519ae5eb1502fc059d4b

Authored by michael
1 parent e68cbf56

aliased table names and fixed search by category query 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2264 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 13 additions and 12 deletions
presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
  View file @a3a51d1
@@ -20,11 +20,12 @@ function getMessage() { @@ -20,11 +20,12 @@ function getMessage() {
20 function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCategory) { 20 function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCategory) {
21 global $default; 21 global $default;
22 $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 " . 22 $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 " .
23 - "FROM documents AS D INNER JOIN document_text AS DT ON D.id = DT.document_id " . 23 + "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_text_table AS DT ON D.id = DT.document_id " .
  24 + "INNER JOIN $default->owl_document_fields_table AS DFL ON DT.document_id=DFL.document_id " .
24 "INNER JOIN $default->owl_fields_table AS DF ON DF.id = DFL.document_field_id " . 25 "INNER JOIN $default->owl_fields_table AS DF ON DF.id = DFL.document_field_id " .
25 - "INNER JOIN status_lookup AS SL ON D.status_id = SL.id " .  
26 - "INNER JOIN folders AS F on F.ID = D.folder_id " .  
27 - "INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.id " . 26 + "INNER JOIN $default->owl_status_table AS SL ON D.status_id = SL.id " .
  27 + "INNER JOIN $default->owl_folders_table AS F on F.ID = D.folder_id " .
  28 + "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " .
28 "WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " . 29 "WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " .
29 "AND SDUL.user_id = " . $_SESSION["userID"] . " " . 30 "AND SDUL.user_id = " . $_SESSION["userID"] . " " .
30 "AND SL.name='Live' "; 31 "AND SL.name='Live' ";
@@ -57,10 +58,10 @@ function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCate @@ -57,10 +58,10 @@ function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCate
57 function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $iDocTypeID) { 58 function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $iDocTypeID) {
58 global $default; 59 global $default;
59 $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 " . 60 $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 " .
60 - "FROM documents AS D INNER JOIN document_text AS DT ON D.id = DT.document_id " .  
61 - "INNER JOIN status_lookup AS SL ON D.status_id = SL.id " .  
62 - "INNER JOIN folders AS F on F.ID = D.folder_id " .  
63 - "INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.id " . 61 + "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_text_table AS DT ON D.id = DT.document_id " .
  62 + "INNER JOIN $default->owl_status_table AS SL ON D.status_id = SL.id " .
  63 + "INNER JOIN $default->owl_folders_table AS F on F.ID = D.folder_id " .
  64 + "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " .
64 "WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " . 65 "WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " .
65 "AND SDUL.user_id = " . $_SESSION["userID"] . " "; 66 "AND SDUL.user_id = " . $_SESSION["userID"] . " ";
66 if (isset($iDocTypeID)) { 67 if (isset($iDocTypeID)) {
@@ -92,10 +93,10 @@ function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $i @@ -92,10 +93,10 @@ function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $i
92 function getSeachResultsByFolder($iFolderID, $iStartIndex, $sKeywords) { 93 function getSeachResultsByFolder($iFolderID, $iStartIndex, $sKeywords) {
93 global $default; 94 global $default;
94 $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 " . 95 $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 " .
95 - "FROM documents AS D INNER JOIN document_text AS DT ON D.id = DT.document_id " .  
96 - "INNER JOIN status_lookup AS SL ON D.status_id = SL.id " .  
97 - "INNER JOIN folders AS F on F.ID = D.folder_id " .  
98 - "INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.id " . 96 + "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_text_table AS DT ON D.id = DT.document_id " .
  97 + "INNER JOIN $default->owl_status_table AS SL ON D.status_id = SL.id " .
  98 + "INNER JOIN $default->owl_folders_table AS F on F.ID = D.folder_id " .
  99 + "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " .
99 "WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " . 100 "WHERE MATCH(DT.document_text) AGAINST ('" . $sKeywords . "') " .
100 "AND SDUL.user_id = " . $_SESSION["userID"] . " " . 101 "AND SDUL.user_id = " . $_SESSION["userID"] . " " .
101 "AND SL.name='Live' "; 102 "AND SL.name='Live' ";