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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 15d5385..10a3915 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -7,7 +7,7 @@
 var mkws = {
     sort: 'relevance',
     authenticated: false,
-    filters: [],
+    filters: []
 };
 
 /*
@@ -22,10 +22,6 @@ 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",
@@ -108,7 +104,7 @@ var debug = mkws.debug_function; // local alias
 
 
 Handlebars.registerHelper('json', function(obj) {
-    return JSON.stringify(obj);
+    return $.toJSON(obj);
 });
 
 
@@ -164,6 +160,7 @@ Handlebars.registerHelper('commaList', function(items, options) {
     /* default mkws config */
     var config_default = {
 	use_service_proxy: true,
+	pazpar2_url: "http://mkws.indexdata.com/service-proxy/",
 	service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth",
 	lang: "",
 	sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
@@ -200,6 +197,8 @@ 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.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;
@@ -222,7 +221,7 @@ 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.pazpar2path,
+                    "pazpar2path": mkws_config.pazpar2_url,
                     "oninit": my_oninit,
                     "onstat": my_onstat,
                     "onterm": my_onterm,
@@ -423,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;
     }
@@ -487,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 });
 }
 
@@ -534,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);
 	}
     }
@@ -557,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);
 	}
     }
@@ -907,7 +906,8 @@ function mkws_html_all() {
 
     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);
 
     if (mkws_config.responsive_design_width) {
 	// Responsive web design - change layout on the fly based on
@@ -1016,9 +1016,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;