X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=df75dd61cf8b2f39f81561ff93cf1287a4e8328e;hb=4cd979fd64927a1fce7e7903a15e4282fc6957d1;hp=9ffe3e1e448adab75aedf866cf3309a7796ef426;hpb=859e28a7c5879af9c23b75e219ac7ce0ed317eb7;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 9ffe3e1..df75dd6 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -7,7 +7,7 @@
 var mkws = {
     sort: 'relevance',
     authenticated: false,
-    filters: [],
+    filters: []
 };
 
 /*
@@ -196,6 +196,9 @@ Handlebars.registerHelper('commaList', function(items, options) {
 mkws.sort = mkws_config.sort_default;
 debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to mkws.sort");
 
+mkws.pazpar2path = mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/";
+mkws.usesessions = mkws_config.use_service_proxy ? false : true;
+
 if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
     debug("Reset query width: " + mkws_config.query_width);
     mkws_config.query_width = 50;
@@ -218,13 +221,13 @@ for (var key in mkws_config) {
 // autoInit is set to true on default
 var my_paz = new pz2( { "onshow": my_onshow,
                     "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
-                    "pazpar2path": mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/",
+                    "pazpar2path": mkws.pazpar2path,
                     "oninit": my_oninit,
                     "onstat": my_onstat,
                     "onterm": my_onterm,
                     "termlist": "xtargets,subject,author",
                     "onbytarget": my_onbytarget,
-	 	    "usesessions" : mkws_config.use_service_proxy ? false : true,
+	 	    "usesessions" : mkws.usesessions,
                     "showResponseType": '', // or "json" (for debugging?)
                     "onrecord": my_onrecord } );
 
@@ -417,7 +420,7 @@ function onFormSubmitEventHandler()
     return false;
 }
 
-function newSearch(query)
+function newSearch(query, sort, targets)
 {
     if (!mkws.authenticated) {
 	alert("searching before authentication");
@@ -428,7 +431,7 @@ function newSearch(query)
     redraw_navi();
     resetPage();
     loadSelect();
-    triggerSearch(query);
+    triggerSearch(query, sort, targets);
     mkws.switchView('records'); // In case it's configured to start off as hidden
     submitted = true;
 }
@@ -448,22 +451,34 @@ function resetPage()
     totalRec = 0;
 }
 
-function triggerSearch (query)
+function triggerSearch (query, sort, targets)
 {
     var pp2filter = "";
     var pp2limit = "";
 
-    // Re-use previous query if a new one is not specified
+    // Re-use previous query/sort if new ones are not specified
     if (query) {
 	mkws.query = query;
     }
+    if (sort) {
+	mkws.sort = sort;
+    }
+    if (targets) {
+	// ### should support multiple |-separated targets
+	mkws.filters.push({ id: targets, name: targets });
+    }
 
     for (var i in mkws.filters) {
 	var filter = mkws.filters[i];
 	if (filter.id) {
 	    if (pp2filter)
 		pp2filter += ",";
-	    pp2filter += 'pz:id=' + filter.id;
+	    if (filter.id.match(/^[a-z:]+[=~]/)) {
+		debug("filter '" + filter.id + "' already begins with SETTING OP");
+	    } else {
+		filter.id = 'pz:id=' + filter.id;
+	    }
+	    pp2filter += filter.id;
 	} else {
 	    if (pp2limit)
 		pp2limit += ",";
@@ -511,7 +526,7 @@ mkws.limitTarget  = function (id, name)
 
 mkws.delimitQuery = function (field, value)
 {
-    debug("delimitQuery(field=" + field + ", value=" + value + ")");    
+    debug("delimitQuery(field=" + field + ", value=" + value + ")");
     var newFilters = [];
     for (var i in mkws.filters) {
 	var filter = mkws.filters[i];
@@ -536,7 +551,7 @@ mkws.delimitQuery = function (field, value)
 
 mkws.delimitTarget = function (id)
 {
-    debug("delimitTarget(id=" + id + ")");    
+    debug("delimitTarget(id=" + id + ")");
     var newFilters = [];
     for (var i in mkws.filters) {
 	var filter = mkws.filters[i];
@@ -577,7 +592,7 @@ function redraw_navi ()
 		');return false;">' + filter.value + '</a>';
 	}
     }
-    
+
     navi.innerHTML = text;
 }
 
@@ -890,7 +905,7 @@ function mkws_html_all() {
     mkws_html_switch();
 
     if (mkws_config.use_service_proxy)
-	  mkws_service_proxy_auth(mkws_config.service_proxy_auth, 
+	  mkws_service_proxy_auth(mkws_config.service_proxy_auth,
           mkws_config.service_proxy_auth_domain);
 
     if (mkws_config.responsive_design_width) {
@@ -920,9 +935,12 @@ function run_auto_searches() {
     if (node.attr('autosearch')) {
 	var query = node.attr('autosearch');
 	var sort = node.attr('sort');
-	debug("running auto search: '" + query + "' sorted by '" + sort + "'");
-	// ### currently ignoring sort
-	newSearch(query);
+	var targets = node.attr('targets');
+	var s = "running auto search: '" + query + "'";
+	if (sort) s += " sorted by '" + sort + "'";
+	if (targets) s += " in targets '" + targets + "'";
+	debug(s);
+	newSearch(query, sort, targets);
     }
 }