one variable less

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 18ac664..8ca0040 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -22,6 +22,9 @@ if (!mkws_config)
 // Wrapper for jQuery
 (function ($) {
 
+mkws.pazpar2path = mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/";
+mkws.usesessions = mkws_config.use_service_proxy ? false : true;
+
 mkws.locale_lang = {
     "de": {
        "Authors": "Autoren",
@@ -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 } );
 
@@ -469,9 +472,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)
@@ -520,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];
@@ -545,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];
@@ -586,7 +592,7 @@ function redraw_navi ()
                ');return false;">' + filter.value + '</a>';
        }
     }
-    
+
     navi.innerHTML = text;
 }
 
@@ -899,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) {