X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=892acef38b615c18cc774d0cc462f429718fe36f;hb=99fdcf8c4e10b7da14cc23221318f24148dd0acf;hp=18ac664b852808ff5600c782b9c82f5d46573da1;hpb=c52fd3b80ba09d9be09ec45a4dc17fe4bd96064b;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 18ac664..892acef 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -22,6 +22,11 @@ if (!mkws_config)
 // Wrapper for jQuery
 (function ($) {
 
+var pazpar2_url = mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/";
+
+mkws.pazpar2path = pazpar2_url;
+mkws.usesessions = mkws_config.use_service_proxy ? false : true;
+
 mkws.locale_lang = {
     "de": {
 	"Authors": "Autoren",
@@ -218,13 +223,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 } );
 
@@ -469,9 +474,12 @@ function triggerSearch (query, sort, targets)
 	var filter = mkws.filters[i];
 	if (filter.id) {
 	    if (pp2filter)
-		pp2filter += "|";
-	    if (filter.id.indexOf('pz:id=') != 0)
+		pp2filter += ",";
+	    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)