diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php index 2dbf43e..02d48c6 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php +++ b/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php @@ -21,90 +21,82 @@ if (checkSession()) { require_once("$default->fileSystemRoot/presentation/Html.inc"); require_once("standardSearchUI.inc"); - //echo $fSearchText . "
" . $fFolderID; - if (!isset($fStartIndex)) { $fStartIndex = 0; } - //escape the search string - //$fStandardSearchString = addslashes($fStandardSearchString); - - - if (strlen($fBrowseType) > 0) { - //the user was browsing by a specific type - switch ($fBrowseType) { - case "folder" : - //echo "searching by folder browsetype"; - //user was browsing a specific folder - search that folder - if (!$fFolderID) { - //start at the root folder - $fFolderID = 1; - } - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getSeachResultsByFolder($fFolderID, $fStartIndex, $fSearchText)); - $main->setCentralPayload($oPatternCustom); - $main->render(); - break; - case "category" : - //echo "searching by category browse type"; - //user was browsing by category - search all documents in that category - if (!$fCategoryName) { - //no category name specified, so just start at the root folder - $fFolderID = 1; - } - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getSearchResultsByCategory($fFolderID, $fSearchText, $fStartIndex, $fCategoryName)); - $main->setCentralPayload($oPatternCustom); - $main->render(); - break; - case "documentType" : - //echo "searching by documentType browseType"; - //user was browsing by document type - search all documents in that doc type - if (!$fDocTypeID) { - //no document type specified, so just start at the root folder - $fFolderID = 1; - } - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getSearchResultsByDocumentType($fFolderID, $fSearchText, $fStartIndex, $fDocTypeID)); - $main->setCentralPayload($oPatternCustom); - $main->render(); - break; - default: - //search from the root folder down i.e. all documents - //echo "unknown search type"; - break; - } - } else if (strlen($fFolderID) > 0) { - //the user was browsing a folder, search that folder - //echo "searching by folder id"; - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getSeachResultsByFolder($fFolderID, $fStartIndex, $fSearchText)); - $main->setCentralPayload($oPatternCustom); - $main->render(); - - } else if (strlen($fDocumentID) > 0) { - //echo "searching by document id"; - //the user was viewing a document, search in that document's folder - $oDocument = Document::get($fDocumentID); - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getSeachResultsByFolder($oDocument->getFolderID(), $fStartIndex, $fSearchText)); - $main->setCentralPayload($oPatternCustom); - $main->render(); - } else { - //echo "searching by folder"; - //search from the root folder down i.e. all documents - $fFolderID = 1; - require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getSeachResultsByFolder($fFolderID, $fStartIndex, $fSearchText)); - $main->setCentralPayload($oPatternCustom); - $main->render(); - } + + if (strlen($fBrowseType) > 0) { + //the user was browsing by a specific type + switch ($fBrowseType) { + case "folder" : + //user was browsing a specific folder - search that folder + if (!$fFolderID) { + //start at the root folder + $fFolderID = 1; + } + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml(getSeachResultsByFolder($fFolderID, $fStartIndex, $fSearchText)); + $main->setCentralPayload($oPatternCustom); + $main->render(); + break; + case "category" : + //user was browsing by category - search all documents in that category + if (!$fCategoryName) { + //no category name specified, so just start at the root folder + $fFolderID = 1; + } + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml(getSearchResultsByCategory($fFolderID, $fSearchText, $fStartIndex, $fCategoryName)); + $main->setCentralPayload($oPatternCustom); + $main->render(); + break; + case "documentType" : + //echo "searching by documentType browseType"; + //user was browsing by document type - search all documents in that doc type + if (!$fDocTypeID) { + //no document type specified, so just start at the root folder + $fFolderID = 1; + } + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml(getSearchResultsByDocumentType($fFolderID, $fSearchText, $fStartIndex, $fDocTypeID)); + $main->setCentralPayload($oPatternCustom); + $main->render(); + break; + default: + //search from the root folder down i.e. all documents + break; + } + } else if (strlen($fFolderID) > 0) { + //the user was browsing a folder, search that folder + //echo "searching by folder id"; + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml(getSeachResultsByFolder($fFolderID, $fStartIndex, $fSearchText)); + $main->setCentralPayload($oPatternCustom); + $main->render(); + + } else if (strlen($fDocumentID) > 0) { + //echo "searching by document id"; + //the user was viewing a document, search in that document's folder + $oDocument = Document::get($fDocumentID); + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml(getSeachResultsByFolder($oDocument->getFolderID(), $fStartIndex, $fSearchText)); + $main->setCentralPayload($oPatternCustom); + $main->render(); + } else { + //echo "searching by folder"; + //search from the root folder down i.e. all documents + $fFolderID = 1; + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml(getSeachResultsByFolder($fFolderID, $fStartIndex, $fSearchText)); + $main->setCentralPayload($oPatternCustom); + $main->render(); + } } //echo "not searching" ?>