Peter M. Groen / knowledgetree

Commit db2af973003a41c56260907a853b05820d8bf7e2

Authored by rob
1 parent 0983c287

no message 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1161 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 9 additions and 9 deletions
presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php
  View file @db2af97
... ... @@ -3,7 +3,7 @@
3 3 * Business logic used to perform document searches
4 4 *
5 5 * Expected form variables
6   -* o fSearchText - text to search on
  6 +* o fStandardSearchString - text to search on
7 7 * o fBrowseType - current browse type
8 8 * o fFolderID - folder currently being browsed (if a folder is being browsed)
9 9 * o fDocumentID - document currently being browsed (if a document is being browsed)
... ... @@ -36,14 +36,14 @@ if (checkSession()) {
36 36 $sFolderString = getApprovedFolderString($fFolderID);
37 37 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
38 38 $oPatternCustom = & new PatternCustom();
39   - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
  39 + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString)));
40 40 $main->setCentralPayload($oPatternCustom);
41 41 $main->render();
42 42 } else {
43 43 $sFolderString = getApprovedFolderString($fFolderID);
44 44 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
45 45 $oPatternCustom = & new PatternCustom();
46   - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
  46 + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString)));
47 47 $main->setCentralPayload($oPatternCustom);
48 48 $main->render();
49 49 }
... ... @@ -56,14 +56,14 @@ if (checkSession()) {
56 56 $sFolderString = getApprovedFolderString($fFolderID);
57 57 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
58 58 $oPatternCustom = & new PatternCustom();
59   - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
  59 + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString)));
60 60 $main->setCentralPayload($oPatternCustom);
61 61 $main->render();
62 62 } else {
63 63 $sFolderString = getApprovedFolderStringFromCategory($fCategoryName);
64 64 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
65 65 $oPatternCustom = & new PatternCustom();
66   - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
  66 + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString)));
67 67 $main->setCentralPayload($oPatternCustom);
68 68 $main->render();
69 69 }
... ... @@ -77,7 +77,7 @@ if (checkSession()) {
77 77 $sFolderString = getApprovedFolderString($fFolderID);
78 78 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
79 79 $oPatternCustom = & new PatternCustom();
80   - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
  80 + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString)));
81 81 $main->setCentralPayload($oPatternCustom);
82 82 $main->render();
83 83 } else {
... ... @@ -99,7 +99,7 @@ if (checkSession()) {
99 99 $sFolderString = getApprovedFolderString($oDocument->getFolderID());
100 100 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
101 101 $oPatternCustom = & new PatternCustom();
102   - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
  102 + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString)));
103 103 $main->setCentralPayload($oPatternCustom);
104 104 $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID");
105 105 $main->setHasRequiredFields(true);
... ... @@ -110,7 +110,7 @@ if (checkSession()) {
110 110 $sFolderString = getApprovedFolderString($fFolderID);
111 111 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
112 112 $oPatternCustom = & new PatternCustom();
113   - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
  113 + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString)));
114 114 $main->setCentralPayload($oPatternCustom);
115 115 $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID");
116 116 $main->setHasRequiredFields(true);
... ...
presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
  View file @db2af97
... ... @@ -48,7 +48,7 @@ function getSearchResults($sFolderIDs,$sSQLSearchString, $iStartIndex) {
48 48 "INNER JOIN $default->owl_words_lookup_table AS WL ON WL.id = DWL.word_id " .
49 49 "WHERE F.id IN ($sFolderIDs) " .
50 50 "AND ($sSQLSearchString)";
51   - "ORDER BY D.name ASC";
  51 + "ORDER BY D.name ASC";
52 52 $aColumns = array("folder_image_url", "document_name");
53 53 $aColumnTypes = array(4,3);
54 54 $aColumnHeaders = array("","Document");
... ...