Peter M. Groen / knowledgetree

Commit 70ded562c340a24068a83a9f41f08d3c86d88263

Authored by michael
1 parent fa93e169

used table aliases 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2262 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
presentation/lookAndFeel/knowledgeTree/administration/documentmanagement/manageArchivedDocumentsBL.php
  View file @70ded56
... ... @@ -139,10 +139,10 @@ function searchForDocuments($sMetaTagIDs, $sSQLSearchString, $sStatus = "Live")
139 139 global $default;
140 140 $aDocuments = array();
141 141 $sQuery = "SELECT DISTINCT D.id " .
142   - "FROM documents AS D INNER JOIN document_fields_link AS DFL ON DFL.document_id = D.id " .
143   - "INNER JOIN document_fields AS DF ON DF.id = DFL.document_field_id " .
144   - "INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.ID " .
145   - "INNER JOIN status_lookup AS SL on D.status_id=SL.id " .
  142 + "FROM $default->owl_documents_table AS D INNER JOIN document_fields_link AS DFL ON DFL.document_id = D.id " .
  143 + "INNER JOIN $default->owl_fields_table AS DF ON DF.id = DFL.document_field_id " .
  144 + "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.ID " .
  145 + "INNER JOIN $default->owl_status_table AS SL on D.status_id=SL.id " .
146 146 "WHERE DF.ID IN ($sMetaTagIDs) " .
147 147 "AND (" . $sSQLSearchString . ") " .
148 148 "AND SL.name='$sStatus' " .
... ...
presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
  View file @70ded56
... ... @@ -84,10 +84,10 @@ function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex, $sStatu
84 84  
85 85 $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 " .
86 86 "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_folders_table AS F ON D.folder_id = F.id " .
87   - "INNER JOIN document_fields_link AS DFL ON DFL.document_id = D.id " .
88   - "INNER JOIN document_fields AS DF ON DF.id = DFL.document_field_id " .
89   - "INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.ID " .
90   - "INNER JOIN status_lookup AS SL on D.status_id=SL.id " .
  87 + "INNER JOIN $default->owl_document_fields_table AS DFL ON DFL.document_id = D.id " .
  88 + "INNER JOIN $default->owl_fields_table AS DF ON DF.id = DFL.document_field_id " .
  89 + "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.ID " .
  90 + "INNER JOIN $default->owl_status_table AS SL on D.status_id=SL.id " .
91 91 "WHERE DF.ID IN ($sMetaTagIDs) " .
92 92 "AND (" . $sSQLSearchString . ") " .
93 93 "AND SDUL.user_id = " . $_SESSION["userID"] . " " .
... ...