diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php index 0cfdb33..b0c6e46 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php +++ b/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php @@ -3,7 +3,7 @@ * Business logic used to perform document searches * * Expected form variables -* o fSearchText - text to search on +* o fStandardSearchString - text to search on * o fBrowseType - current browse type * o fFolderID - folder currently being browsed (if a folder is being browsed) * o fDocumentID - document currently being browsed (if a document is being browsed) @@ -36,14 +36,14 @@ if (checkSession()) { $sFolderString = getApprovedFolderString($fFolderID); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString))); $main->setCentralPayload($oPatternCustom); $main->render(); } else { $sFolderString = getApprovedFolderString($fFolderID); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString))); $main->setCentralPayload($oPatternCustom); $main->render(); } @@ -56,14 +56,14 @@ if (checkSession()) { $sFolderString = getApprovedFolderString($fFolderID); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString))); $main->setCentralPayload($oPatternCustom); $main->render(); } else { $sFolderString = getApprovedFolderStringFromCategory($fCategoryName); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString))); $main->setCentralPayload($oPatternCustom); $main->render(); } @@ -77,7 +77,7 @@ if (checkSession()) { $sFolderString = getApprovedFolderString($fFolderID); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString))); $main->setCentralPayload($oPatternCustom); $main->render(); } else { @@ -99,7 +99,7 @@ if (checkSession()) { $sFolderString = getApprovedFolderString($oDocument->getFolderID()); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString))); $main->setCentralPayload($oPatternCustom); $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID"); $main->setHasRequiredFields(true); @@ -110,7 +110,7 @@ if (checkSession()) { $sFolderString = getApprovedFolderString($fFolderID); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); + $oPatternCustom->setHtml(getPage($fStandardSearchString, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fStandardSearchString))); $main->setCentralPayload($oPatternCustom); $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID"); $main->setHasRequiredFields(true); diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc index 15b2b7c..ba3789e 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc @@ -48,7 +48,7 @@ function getSearchResults($sFolderIDs,$sSQLSearchString, $iStartIndex) { "INNER JOIN $default->owl_words_lookup_table AS WL ON WL.id = DWL.word_id " . "WHERE F.id IN ($sFolderIDs) " . "AND ($sSQLSearchString)"; - "ORDER BY D.name ASC"; + "ORDER BY D.name ASC"; $aColumns = array("folder_image_url", "document_name"); $aColumnTypes = array(4,3); $aColumnHeaders = array("","Document");