diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php
deleted file mode 100644
index 3571913..0000000
--- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php
+++ /dev/null
@@ -1,127 +0,0 @@
-fileSystemRoot/lib/visualpatterns/PatternBrowsableSearchResults.inc");
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
- require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
- require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
- require_once("$default->fileSystemRoot/presentation/Html.inc");
- require_once("standardSearchUI.inc");
-
- if (!isset($fStartIndex)) {
- $fStartIndex = 1;
- }
-
- 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"
-?>
-
diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
deleted file mode 100644
index 2ed62fb..0000000
--- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc
+++ /dev/null
@@ -1,187 +0,0 @@
-
" . _("If your browser displays a 'Warning: Page has Expired' message when you attempt to return to these search results, please click your browser's 'Refresh' button") . "
";
-}
-
-function getSearchResultsByCategory($iFolderID, $sKeywords, $iStartIndex, $sCategory) {
- global $default;
-
- // XXX: Icky MySQL-specific stuff.
- $sVersion = DBUtil::getOneResultKey("SHOW VARIABLES LIKE 'version'", "Value");
- if ((int)substr($sVersion, 0, 1) >= 4) {
- $boolean_mode = "IN BOOLEAN MODE";
- } else {
- $boolean_mode = "";
- }
-
-
- /*ok*/ $sQuery = "SELECT DISTINCT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, " .
- "F.id AS folder_id, D.id AS document_id, D.name AS document_name, " .
- "ROUND(MATCH(DT.document_text) AGAINST (? $boolean_mode) OR 1, 3) AS score " .
- "FROM $default->documents_table AS D INNER JOIN $default->document_text_table AS DT ON D.id = DT.document_id " .
- "INNER JOIN $default->document_fields_link_table AS DFL ON DT.document_id=DFL.document_id " .
- "INNER JOIN $default->document_fields_table AS DF ON DF.id = DFL.document_field_id " .
- "INNER JOIN $default->status_table AS SL ON D.status_id = SL.id " .
- "INNER JOIN $default->folders_table AS F on F.ID = D.folder_id " .
- "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " .
- "WHERE MATCH(DT.document_text) AGAINST (? $boolean_mode) " .
- "AND (F.is_public OR SDUL.user_id = ?) " .
- "AND SL.name='Live' ";
- $aParams = array($sKeywords, $sKeywords, $_SESSION["userID"]);
- //only check in the parent_folder_ids if we're not searching from the
- //root folder down
- if (isset($iFolderID) && ($iFolderID != 1)) {
- $iFolderID = (int)$iFolderID;
- $sQuery .= "AND (F.parent_folder_ids LIKE '%,$iFolderID,%' OR F.id = $iFolderID) ";
- }
- $sQuery .= "AND DF.name LIKE 'Category' ";
- if (isset($sCategory)) {
- $sQuery .= "AND DFL.value LIKE ? ";
- $aParams[] = $sCategory;
- }
- $sQuery .= "ORDER BY score DESC";
-
- $aColumns = array("folder_image_url", "document_name","score");
- $aColumnTypes = array(4,3,1);
- $aColumnHeaders = array("" . _("Folder") . "","" . _("Document") . "","" . _("Score") . "");
- $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument");
- $aDBQueryStringColumns = array("document_id","folder_id");
- $aQueryStringVariableNames = array("fDocumentID", "fFolderID");
-
- $oPatternBrowse = & new PatternBrowseableSearchResults(array($sQuery, $aParams), 10, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
- $oPatternBrowse->setStartIndex($iStartIndex);
- $oPatternBrowse->setSearchText($sKeywords);
- return getHeading() . $oPatternBrowse->render() . getSearchVariablesHtml($sKeywords, "category", $iFolderID, "", $sCategory, "") . getMessage();
-}
-
-function getSearchResultsByDocumentType($iFolderID, $sKeywords, $iStartIndex, $iDocTypeID) {
- global $default;
-
- // XXX: Icky MySQL-specific stuff.
- $sVersion = DBUtil::getOneResultKey("SHOW VARIABLES LIKE 'version'", "Value");
- if ((int)substr($sVersion, 0, 1) >= 4) {
- $boolean_mode = "IN BOOLEAN MODE";
- } else {
- $boolean_mode = "";
- }
-
- /*ok*/ $sQuery = "SELECT DISTINCT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, " .
- "F.id AS folder_id, D.id AS document_id, D.name AS document_name, " .
- "ROUND(MATCH(DT.document_text) AGAINST (? $boolean_mode),3) AS score " .
- "FROM $default->documents_table AS D INNER JOIN $default->document_text_table AS DT ON D.id = DT.document_id " .
- "INNER JOIN $default->status_table AS SL ON D.status_id = SL.id " .
- "INNER JOIN $default->folders_table AS F on F.ID = D.folder_id " .
- "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " .
- "WHERE MATCH(DT.document_text) AGAINST (? $boolean_mode) " .
- "AND (F.is_public OR SDUL.user_id = ?) ";
- $aParams = array($sKeywords, $sKeywords, $_SESSION["userID"]);
- if (isset($iDocTypeID)) {
- $sQuery .= "AND D.document_type_id = ? ";
- $aParams[] = $iDocTypeID;
- }
- $sQuery .= "AND SL.name='Live' ";
- //only check in the parent_folder_ids if we're not searching from the
- //root folder down
- if (isset($iFolderID) && ($iFolderID != 1)) {
- $iFolderID = (int)$iFolderID;
- $sQuery .= "AND (F.parent_folder_ids LIKE '%,$iFolderID,%' OR F.id = $iFolderID) ";
- }
- $sQuery .= "ORDER BY score DESC";
-
- $aColumns = array("folder_image_url", "document_name","score");
- $aColumnTypes = array(4,3,1);
- $aColumnHeaders = array("" . _("Folder") . "","" . _("Document") . "","" . _("Score") . "");
- $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument");
- $aDBQueryStringColumns = array("document_id","folder_id");
- $aQueryStringVariableNames = array("fDocumentID", "fFolderID");
-
- $oPatternBrowse = & new PatternBrowseableSearchResults(array($sQuery, $aParams), 10, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
- $oPatternBrowse->setStartIndex($iStartIndex);
- $oPatternBrowse->setSearchText($sKeywords);
- return getHeading() . $oPatternBrowse->render() . getSearchVariablesHtml($sKeywords, "documentType", $iFolderID, "", "", $iDocTypeID) . getMessage();
-
-}
-
-function getSeachResultsByFolder($iFolderID, $iStartIndex, $sKeywords) {
- global $default;
-
- // XXX: Icky MySQL-specific stuff.
- $sVersion = DBUtil::getOneResultKey("SHOW VARIABLES LIKE 'version'", "Value");
- if ((int)substr($sVersion, 0, 1) >= 4) {
- $boolean_mode = "IN BOOLEAN MODE";
- } else {
- $boolean_mode = "";
- }
-
- /*ok*/ $sQuery = "SELECT DISTINCT '" . "$default->graphicsUrl/widgets/dfolder.gif" . "' AS folder_image_url, " .
- "F.id AS folder_id, D.id AS document_id, D.name AS document_name, " .
- "ROUND(MATCH(DT.document_text) AGAINST (? $boolean_mode),3) AS score " .
- "FROM $default->documents_table AS D INNER JOIN $default->document_text_table AS DT ON D.id = DT.document_id " .
- "INNER JOIN $default->status_table AS SL ON D.status_id = SL.id " .
- "INNER JOIN $default->folders_table AS F on F.ID = D.folder_id " .
- "INNER JOIN $default->search_permissions_table AS SDUL ON SDUL.document_id = D.id " .
- "WHERE MATCH(DT.document_text) AGAINST (? $boolean_mode) " .
- "AND (F.is_public OR SDUL.user_id = ?) " .
- "AND SL.name='Live' ";
- $aParams = array($sKeywords, $sKeywords, $_SESSION["userID"]);
- //only check in the parent_folder_ids if we're not searching from the
- //root folder down
- if (isset($iFolderID) && ($iFolderID != 1)) {
- $iFolderID = (int)$iFolderID;
- $sQuery .= "AND (F.parent_folder_ids LIKE '%,$iFolderID,%' OR F.id = $iFolderID) ";
- }
- $sQuery .= "ORDER BY score DESC";
-
- $aColumns = array("folder_image_url", "document_name","score");
- $aColumnTypes = array(4,3,1);
- $aColumnHeaders = array("" . _("Folder") . "", "" . _("Document") . "", "" . _("Score") . "");
- $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument");
- $aDBQueryStringColumns = array("document_id","folder_id");
- $aQueryStringVariableNames = array("fDocumentID", "fFolderID");
-
- $oPatternBrowse = & new PatternBrowseableSearchResults(array($sQuery, $aParams), 10, $aColumns, $aColumnTypes, $aColumnHeaders, $aLinkURLs, $aDBQueryStringColumns, $aQueryStringVariableNames);
- $oPatternBrowse->setStartIndex($iStartIndex);
- $oPatternBrowse->setSearchText($sKeywords);
- return getHeading() . $oPatternBrowse->render() . getSearchVariablesHtml($sKeywords, "", $iFolderID, "", "", "") . getMessage();
-}
-
-function getSearchVariablesHtml($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType) {
- $sToRender = "\n";
- $sToRender .= "\n";
- $sToRender .= "\n";
- $sToRender .= "\n";
- $sToRender .= "\n";
- $sToRender .= "\n";
- return $sToRender;
-}
-?>