From f695de1519cb565fe3e1ba58bbcd0f6672005f97 Mon Sep 17 00:00:00 2001 From: Neil Blakey-Milner Date: Thu, 22 Dec 2005 13:22:37 +0000 Subject: [PATCH] Remove a broken advanced search, awaiting a working one using the new infrastructure. --- search/advancedSearchBL.php | 59 ----------------------------------------------------------- search/advancedSearchUI.inc | 143 ----------------------------------------------------------------------------------------------------------------------------------------------- search/advancedSearchUtil.inc | 155 ----------------------------------------------------------------------------------------------------------------------------------------------------------- 3 files changed, 0 insertions(+), 357 deletions(-) delete mode 100755 search/advancedSearchBL.php delete mode 100644 search/advancedSearchUI.inc delete mode 100644 search/advancedSearchUtil.inc diff --git a/search/advancedSearchBL.php b/search/advancedSearchBL.php deleted file mode 100755 index 2ec1450..0000000 --- a/search/advancedSearchBL.php +++ /dev/null @@ -1,59 +0,0 @@ -fileSystemRoot/lib/visualpatterns/PatternBrowsableSearchResults.inc"); - require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableTableSqlQuery.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/lib/security/Permission.inc"); - require_once("advancedSearchUI.inc"); - - if (!isset($fStartIndex)) { - $fStartIndex = 1; - } - - if (strlen($fForSearch)) { - dealWithAdvancedSearch($_REQUEST, $fStartIndex); - } else { - //display search criteria - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getSearchPage()); - $main->setHasRequiredFields(true); - $main->setCentralPayload($oPatternCustom); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fForSearch=1"); - $main->render(); - } -} -?> diff --git a/search/advancedSearchUI.inc b/search/advancedSearchUI.inc deleted file mode 100644 index 13588d5..0000000 --- a/search/advancedSearchUI.inc +++ /dev/null @@ -1,143 +0,0 @@ -fileSystemRoot/lib/browse/Criteria.inc"); - -function getMetaData($aMetaTagIDs) { - global $default; - /*ok*/ $sQuery = "SELECT name, id FROM $default->document_fields_table ORDER BY name ASC"; - - $sql = $default->db; - $sql->query($sQuery); - - $sToRender = "\n"; - $sToRender .= "\n"; - - $iRecordCount = 0; - $sCheckAllJavascript = ""; - while ($sql->next_record()) { - $sCheckAllJavascript .= "document.MainForm.f_adv_$iRecordCount.checked=value;\n"; - $sMetaDataCheckBox = "f("id"), $aMetaTagIDs) . " name=\"f_adv_$iRecordCount\" value=\"" . $sql->f("id") . "\">\n"; - } else if (($iRecordCount % 3) == 0) { - $sToRender .= "\n"; - } else { - $sToRender .= "\n"; - } - } - - $sToRender .= "\n"; - $sToRender .= "\n\n\n\n"; - $sToRender .= ""; - $sToRender .= "
" . $sql->f("name"); - $iRecordCount++; - if (($iRecordCount % 3) == 1) { - $sToRender .= "
$sMetaDataCheckBox$sMetaDataCheckBox
$sMetaDataCheckBox
\n"; - - return $sToRender; -} - -function getSearchPage($sSearchString = "", $aMetaTagIDs = array(), $sHeading = null, $bSearchArchive = false) { - global $default; - if (is_null($sHeading)) { - $sHeading = _("Advanced Search"); - } - - $sToRender = renderHeading($sHeading); - - $sToRender .= sprintf('

Want to use AND or OR? Use the - Boolean Search

', 'booleanSearch.php'); - - $sToRender .= "
"; - - $sToRender .= "\n"; - $sToRender .= ""; - $aBaseCriteria = Criteria::getBaseCriteria(); - foreach ($aBaseCriteria as $k => $v) { - $sToRender .= $v->searchDisplay($_REQUEST); - } - $sToRender .= ""; - $aGenericCriteria = Criteria::getGenericCriteria(); - foreach ($aGenericCriteria as $k => $v) { - $sToRender .= $v->searchDisplay($_REQUEST); - } - - if ($bSearchArchive) { - $sToRender .= ""; - } else { - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= ""; - } - - $sToRender .= "

" . _("Document Data") . "

" . _("Document Fields") . "

 
" . _("Search") . ": " . _("Documents") . "
\n"; - $sToRender .= "\n"; - $sToRender .= "
"; - - return $sToRender . getSearchValidationJavaScript(); -} - -function getSearchValidationJavaScript() { - /*$sToRender = "\n\n\n\n"; - return $sToRender;*/ - return ""; -} - -function wasSelected($iID, $aMetaTagIDs) { - if (in_array($iID, $aMetaTagIDs)) { - return "CHECKED"; - } - return ""; -} - -function getSearchVariablesHtml($sSearchText, $sStatus, $sMetaTagIDs) { - $aMetaTagIDs = explode(",", $sMetaTagIDs); - $sToRender = "\n\n\n"; - $sToRender .= "\n\n\n"; - $sToRender .= "\n\n\n"; - $sToRender .= "\n"; - for ($i = 0; $i < count($aMetaTagIDs); $i++) { - $sToRender .= "\n"; - - } - $sToRender .= "\n"; - return $sToRender; -} -?> diff --git a/search/advancedSearchUtil.inc b/search/advancedSearchUtil.inc deleted file mode 100644 index 6554ff7..0000000 --- a/search/advancedSearchUtil.inc +++ /dev/null @@ -1,155 +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") . ""; - - $aReq = array(); - foreach ($aOrigReq as $k => $v) { - if (searchCriteria($k) === 1) { - $v = trim($v); - if ($v === "") { - continue; - } - if ($v === "-1") { - continue; - } - $aReq[$k] = $v; - } - } - - $aIDs = array_unique(array_map("criteriaNumber", array_keys($aReq))); - $aSQL = array(); - $aJoinSQL = array(); - foreach ($aIDs as $iID) { - $oCriterion =& Criteria::getCriterionByNumber($iID); - $res = $oCriterion->searchSQL($aReq); - if (!is_null($res)) { - $aSQL[] = $res; - } - $res = $oCriterion->searchJoinSQL(); - if (!is_null($res)) { - $aJoinSQL[] = $res; - } - } - $aCritParams = array(); - $aCritQueries = array(); - foreach ($aSQL as $sSQL) { - if (is_array($sSQL)) { - $aCritQueries[] = $sSQL[0]; - $aCritParams = array_merge($aCritParams , $sSQL[1]); - } else { - $aCritQueries[] = $sSQL; - } - } - - if (count($aCritQueries) == 0) { - return "No search criteria were specified"; - } - - $sSQLSearchString = join(" AND ", $aCritQueries); - $sJoinSQL = join(" ", $aJoinSQL); - - $sToSearch = KTUtil::arrayGet($aOrigReq, 'fToSearch', 'Live'); - - $oPermission =& KTPermission::getByName('ktcore.permissions.read'); - $sPermissionLookupsTable = KTUtil::getTableName('permission_lookups'); - $sPermissionLookupAssignmentsTable = KTUtil::getTableName('permission_lookup_assignments'); - $sPermissionDescriptorsTable = KTUtil::getTableName('permission_descriptors'); - $aGroups = GroupUtil::listGroupsForUserExpand($_SESSION['userID']); - $aPermissionDescriptors = KTPermissionDescriptor::getByGroups($aGroups, array('ids' => true)); - $sPermissionDescriptors = DBUtil::paramArray($aPermissionDescriptors); - - $sQuery = DBUtil::compactQuery(" -SELECT - F.name AS folder_name, F.id AS folder_id, D.id AS document_id, - D.name AS document_name, D.filename AS file_name, COUNT(D.id) AS doc_count, 'View' AS view -FROM - $default->documents_table AS D - INNER JOIN $default->folders_table AS F ON D.folder_id = F.id - $sJoinSQL - INNER JOIN $default->status_table AS SL ON D.status_id=SL.id - INNER JOIN $sPermissionLookupsTable AS PL ON D.permission_lookup_id = PL.id - INNER JOIN $sPermissionLookupAssignmentsTable AS PLA ON PL.id = PLA.permission_lookup_id AND PLA.permission_id = ? -WHERE - PLA.permission_descriptor_id IN ($sPermissionDescriptors) - AND SL.name = ? - AND ($sSQLSearchString) -GROUP BY D.id -ORDER BY doc_count DESC"); - - $aParams = array(); - $aParams[] = $oPermission->getId(); - $aParams = array_merge($aParams, $aPermissionDescriptors); - $aParams[] = $sToSearch; - $aParams = array_merge($aParams, $aCritParams); - - //var_dump(DBUtil::getResultArray(array($sQuery, $aParams))); - //exit(0); - - $aColumns = array("folder_name", "file_name", "document_name", "doc_count", "view"); - $aColumnTypes = array(3,3,3,1,3); - $aColumnHeaders = array("graphicsUrl/widgets/dfolder.gif>" . _("Folder") . "", "" . _("Name") . "", "" . _("Title") . "", "" . _("Matches") . "", "" . _("View") . ""); - $aLinkURLs = array("$default->rootUrl/control.php?action=browse","$default->rootUrl/control.php?action=viewDocument", "$default->rootUrl/control.php?action=viewDocument", null, "$default->rootUrl/control.php?action=downloadDocument"); - $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(""); - $oPatternBrowse->setRememberValues($aReq); - $sForSearch = ""; - - return renderHeading(_("Advanced Search")) . $oPatternBrowse->render() . $sForSearch . $sRefreshMessage; -} - -function dealWithAdvancedSearch($aReq, $iStartIndex) { - global $main; - $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getAdvancedSearchResults($aReq, $iStartIndex)); - $main->setCentralPayload($oPatternCustom); - $main->render(); -} - -?> -- libgit2 0.21.4