Peter M. Groen / knowledgetree

Commit 5d7b67c6ab8bb012a1c909a53eac43352876fb28

Authored by rob
1 parent 0f8e5bac

added match count to search for document ranking 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1747 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 23 additions and 11 deletions
presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php
  View file @5d7b67c
... ... @@ -36,12 +36,14 @@ if (checkSession()) {
36 36 if (!isset($fStartIndex)) {
37 37 $fStartIndex = 0;
38 38 }
39   - $oPatternCustom->setHtml(getSearchResults($sDocument,$fStartIndex, $fSearchString, $sMetaTagIDs));
  39 + //$oPatternCustom->setHtml(getSearchResults($sDocument,$fStartIndex, $fSearchString, $sMetaTagIDs));
  40 + $oPatternCustom->setHtml(getSearchResults($sMetaTagIDs,$sSQLSearchString, $fStartIndex));
40 41 $main->setCentralPayload($oPatternCustom);
41 42 $main->render();
42 43 } else {
43   - $oPatternCustom = & new PatternCustom();
  44 + $oPatternCustom = & new PatternCustom();
44 45 $oPatternCustom->setHtml(getSearchPage($fSearchString, explode(",",$sMetaTagIDs)));
  46 + //$oPatternCustom->setHtml(getSearchResults($sMetaTagIDs,$sSQLSearchString, $fStartIndex));
45 47 $main->setCentralPayload($oPatternCustom);
46 48 $main->setErrorMessage("No documents matched your search criteria");
47 49 $main->setFormAction("advancedSearchBL.php?fForSearch=1");
... ...
presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc
  View file @5d7b67c
... ... @@ -71,16 +71,26 @@ function getSearchPage($sSearchString = "", $aMetaTagIDs = array()) {
71 71 return $sToRender . getSearchValidationJavaScript();;
72 72 }
73 73  
74   -function getSearchResults($sSQLSearchString, $iStartIndex, $sSearchText, $sMetaTagIDs) {
75   - global $default;
76   - $sQuery = "SELECT DISTINCT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, F.id folder_id, D.id document_id, D.name AS document_name " .
  74 +//function getSearchResults($sSQLSearchString, $iStartIndex, $sSearchText, $sMetaTagIDs) {
  75 +function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex) {
  76 + global $default;
  77 + $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 " .
77 78 "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_folders_table AS F ON D.folder_id = F.id " .
78   - "WHERE D.id IN ($sSQLSearchString)" .
79   - "ORDER BY D.name ASC";
80   -
81   - $aColumns = array("folder_image_url", "document_name");
82   - $aColumnTypes = array(4,3);
83   - $aColumnHeaders = array("<font color=\"ffffff\">Folder</font>","<font color=\"ffffff\">Document</font>");
  79 + "INNER JOIN document_fields_link AS DFL ON DFL.document_id = D.id " .
  80 + "INNER JOIN document_fields AS DF ON DF.id = DFL.document_field_id " .
  81 + "INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.ID " .
  82 + //"WHERE D.id IN ($sSQLSearchString) " .
  83 + "WHERE DF.ID IN ($sMetaTagIDs) " .
  84 + "AND " . $sSQLSearchString . " " .
  85 + "AND SDUL.user_id = " . $_SESSION["userID"] . " " .
  86 + "GROUP BY D.id ";
  87 + "ORDER BY doc_count DESC ";
  88 +
  89 + //echo $sQuery;
  90 +
  91 + $aColumns = array("folder_image_url", "document_name", "doc_count");
  92 + $aColumnTypes = array(4,3,3);
  93 + $aColumnHeaders = array("<font color=\"ffffff\">Folder</font>","<font color=\"ffffff\">Document</font>", "<font color=\"ffffff\">Matches</font>");
84 94 $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument");
85 95 $aDBQueryStringColumns = array("document_id","folder_id");
86 96 $aQueryStringVariableNames = array("fDocumentID", "fFolderID");
... ...