X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=95b7d4e8d81712343346b8790907bc5aafcc20d2;hb=7ec3f07430fa95894b2e4dce5360a7c20912a12b;hp=6c07d2dc4d79551bd5787c4430ab6d45864881ef;hpb=9094da1deb1965b4a656ff9195818c652d311ed4;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 6c07d2d..95b7d4e 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -7,7 +7,7 @@
 var mkws = {
     sort: 'relevance',
     authenticated: false,
-    filters: [],
+    filters: []
 };
 
 /*
@@ -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,9 @@ function onFormSubmitEventHandler()
 
 function newSearch(query, sort, targets)
 {
-    if (!mkws.authenticated) {
+    debug("newSearch: " + query);
+   
+    if (mkws_config.use_service_proxy && !mkws.authenticated) {
 	alert("searching before authentication");
 	return;
     }
@@ -486,7 +488,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 +535,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 +558,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);
 	}
     }
@@ -904,9 +906,14 @@ function mkws_html_all() {
 
     mkws_html_switch();
 
-    if (mkws_config.use_service_proxy)
+    if (mkws_config.use_service_proxy) {
 	  mkws_service_proxy_auth(mkws_config.service_proxy_auth,
-          mkws_config.service_proxy_auth_domain);
+				  mkws_config.service_proxy_auth_domain,
+				  mkws_config.pazpar2_url);
+    } else {
+	// raw pp2
+	run_auto_searches();
+    }
 
     if (mkws_config.responsive_design_width) {
 	// Responsive web design - change layout on the fly based on
@@ -931,6 +938,8 @@ function mkws_html_all() {
 
 
 function run_auto_searches() {
+    debug("run auto searches");
+
     var node = $('#mkwsRecords');
     if (node.attr('autosearch')) {
 	var query = node.attr('autosearch');
@@ -1015,9 +1024,14 @@ function mkws_html_perpage() {
  * The username/password is configured in the apache config file
  * for the site.
  */
-function mkws_service_proxy_auth(auth_url, auth_domain) {
+function mkws_service_proxy_auth(auth_url, auth_domain, pp2_url) {
     debug("Run service proxy auth URL: " + auth_url);
 
+    if (!auth_domain) {
+	auth_domain = pp2_url.replace(/^http:\/\/(.*?)\/.*/, '$1');
+	debug("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
+    }
+
     var request = new pzHttpRequest(auth_url, function(err) {
 	  alert("HTTP call for authentication failed: " + err)
 	  return;