X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=10a391562e178ee1d2ce4b64a17816920ada9f7f;hb=ea2128e0b27d5832ed2c6b85f046fcb1b3e603ff;hp=d3adf6d42de244fe5af23c2c46e0b6c8071b8fb5;hpb=2d0ada79f156cfca001f06278156ee4fea848837;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index d3adf6d..10a3915 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -104,7 +104,7 @@ var debug = mkws.debug_function; // local alias
 
 
 Handlebars.registerHelper('json', function(obj) {
-    return JSON.stringify(obj);
+    return $.toJSON(obj);
 });
 
 
@@ -422,7 +422,7 @@ function onFormSubmitEventHandler()
 
 function newSearch(query, sort, targets)
 {
-    if (!mkws.authenticated) {
+    if (mkws_config.use_service_proxy && !mkws.authenticated) {
 	alert("searching before authentication");
 	return;
     }
@@ -486,7 +486,7 @@ function triggerSearch (query, sort, targets)
 	}
     }
 
-    debug("triggerSearch(" + mkws.query + "): filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit);
+    debug("triggerSearch(" + mkws.query + "): filters = " + $.toJSON(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit);
     my_paz.search(mkws.query, recPerPage, mkws.sort, pp2filter, undefined, { limit: pp2limit });
 }
 
@@ -533,9 +533,9 @@ mkws.delimitQuery = function (field, value)
 	if (filter.field &&
 	    field == filter.field &&
 	    value == filter.value) {
-	    debug("delimitTarget() removing filter " + JSON.stringify(filter));
+	    debug("delimitTarget() removing filter " + $.toJSON(filter));
 	} else {
-	    debug("delimitTarget() keeping filter " + JSON.stringify(filter));
+	    debug("delimitTarget() keeping filter " + $.toJSON(filter));
 	    newFilters.push(filter);
 	}
     }
@@ -556,9 +556,9 @@ mkws.delimitTarget = function (id)
     for (var i in mkws.filters) {
 	var filter = mkws.filters[i];
 	if (filter.id) {
-	    debug("delimitTarget() removing filter " + JSON.stringify(filter));
+	    debug("delimitTarget() removing filter " + $.toJSON(filter));
 	} else {
-	    debug("delimitTarget() keeping filter " + JSON.stringify(filter));
+	    debug("delimitTarget() keeping filter " + $.toJSON(filter));
 	    newFilters.push(filter);
 	}
     }