From f13f8bcc7df065e452ec16da8851a32031df7d68 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 19 Jun 2008 13:31:28 +0000 Subject: [PATCH 1/1] plugging in copy location search param logic git-svn-id: svn://svn.open-ils.org/ILS/trunk@9868 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/common/js/config.js | 2 ++ Open-ILS/web/opac/common/js/opac_utils.js | 6 ++++++ Open-ILS/web/opac/skin/default/js/result_common.js | 1 + 3 files changed, 9 insertions(+) diff --git a/Open-ILS/web/opac/common/js/config.js b/Open-ILS/web/opac/common/js/config.js index accdcd664b..11016a9c3b 100644 --- a/Open-ILS/web/opac/common/js/config.js +++ b/Open-ILS/web/opac/common/js/config.js @@ -38,6 +38,7 @@ var PARAM_TFORM = 'tf'; /* temporary format for title result pages */ var PARAM_RDEPTH = 'rd'; var PARAM_REDIR = 're'; /* true if we have been redirected by IP (we're at a real lib) */ var PARAM_AVAIL = 'av'; /* limit search results to available items */ +var PARAM_COPYLOCS = 'cl'; // copy (shelving) locations /* URL param values (see comments above) */ var TERM; @@ -73,6 +74,7 @@ var LANGUAGE; var TFORM; var RDEPTH; var AVAIL; +var COPYLOCS; /* cookie values */ var SBEXTRAS; diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js index c730e50da0..590c99db4c 100644 --- a/Open-ILS/web/opac/common/js/opac_utils.js +++ b/Open-ILS/web/opac/common/js/opac_utils.js @@ -166,6 +166,8 @@ function initParams() { TFORM = cgi.param(PARAM_TFORM); RDEPTH = cgi.param(PARAM_RDEPTH); AVAIL = cgi.param(PARAM_AVAIL); + COPYLOCS = cgi.param(PARAM_COPYLOCS); + /* set up some sane defaults */ //if(isNaN(DEPTH)) DEPTH = 0; @@ -205,6 +207,7 @@ function clearSearchParams() { LANGUAGE = null; RDEPTH = null; AVAIL = null; + COPYLOCS = null; } @@ -254,6 +257,7 @@ function getSearches() { return SEARCHES; } function getLanguage() { return LANGUAGE; } function getRdepth() { return RDEPTH; } function getAvail() { return AVAIL; } +function getCopyLocs() { return COPYLOCS; } function findBasePath() { @@ -406,6 +410,8 @@ function buildOPACLink(args, slim, ssl) { string += _appendParam(SORT_DIR, PARAM_SORT_DIR, args, getSortDir, string); if(getAvail()) string += _appendParam(AVAIL, PARAM_AVAIL, args, getAvail, string); + if(getCopyLocs()) + string += _appendParam(COPYLOCS, PARAM_COPYLOCS, args, getCopyLocs, string); return string.replace(/\&$/,'').replace(/\?\&/,"?"); } diff --git a/Open-ILS/web/opac/skin/default/js/result_common.js b/Open-ILS/web/opac/skin/default/js/result_common.js index 0ef27e579d..e2c57b8db4 100644 --- a/Open-ILS/web/opac/skin/default/js/result_common.js +++ b/Open-ILS/web/opac/skin/default/js/result_common.js @@ -85,6 +85,7 @@ function resultCollectSearchIds( type, method, handler ) { if(getLitForm()) args.lit_form = getLitForm().split(/,/); if(getLanguage()) args.language = getLanguage().split(/,/); if(getBibLevel()) args.bib_level = getBibLevel().split(/,/); + if(getCopyLocs()) args.locations = getCopyLocs().split(/,/); _debug('Search args: ' + js2JSON(args)); _debug('Raw query: ' + getTerm()); -- 2.43.2