X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=e3f02a27afbf0018a92ef00aa24c2d1e5028b124;hb=ed4bbecdf389e73ac88b8f8b0158b8180d5945a0;hp=e3ca0e1e108e5434a66ad74a65674e4bd21a567d;hpb=a8b2d0a667a99e18a5aa40a1a5195ccea985b9b8;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index e3ca0e1..e3f02a2 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -2,11 +2,10 @@
 
 "use strict"; // HTML5: disable for debug_level >= 2
 
-// Set up namespace and some state.
+// Set up global mkws object. Contains a hash of session objects,
+// indexed by windowid.
 var mkws = {
-    sort: 'relevance',
-    authenticated: false,
-    filters: []
+    sessions: {}
 };
 
 // Define empty mkws_config for simple applications that don't define it.
@@ -19,7 +18,14 @@ function _mkws($) {
     // if (console && console.log) console.log("run _mkws()");
 
     // call this function only once
-    if (mkws.init) return;
+    if (mkws.init) {
+	alert("_mkws() called twice: how did that happen?!");
+	return;
+    }
+
+mkws.sort = 'relevance';
+mkws.authenticated = false;
+mkws.filters = [];
 
 mkws.locale_lang = {
     "de": {
@@ -42,7 +48,8 @@ mkws.locale_lang = {
 	"Date": "Datum",
 	"Subject": "Schlagwort",
 	"Location": "Ort",
-	// ### to add: Records, Targets
+	"Records": "Datensätze",
+	"Targets": "Datenbanken",
 
 	"dummy": "dummy"
     },
@@ -67,7 +74,8 @@ mkws.locale_lang = {
 	"Date": "Dato",
 	"Subject": "Emneord",
 	"Location": "Lokation",
-	// ### to add: Records, Targets
+	"Records": "Poster",
+	"Targets": "Baser",
 
 	"dummy": "dummy"
     }
@@ -229,6 +237,12 @@ for (var key in mkws_config) {
     }
 }
 
+// protocol independend link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
+if (mkws_config.pazpar2_url.match(/^\/\//)) {
+    mkws_config.pazpar2_url = document.location.protocol + mkws_config.pazpar2_url;
+    debug("adjust protocol independend links: " + mkws_config.pazpar2_url);
+}
+
 debug("Create main pz2 object");
 // create a parameters array and pass it to the pz2's constructor
 // then register the form submit event with the pz2.search function
@@ -258,7 +272,7 @@ var SourceMax = 16;
 var SubjectMax = 10;
 var AuthorMax = 10;
 
-if ($.isNumeric(mkws_config.perpage_default)) {
+if (!isNaN(parseInt(mkws_config.perpage_default))) {
     recPerPage = parseInt(mkws_config.perpage_default);
 }
 
@@ -1076,7 +1090,7 @@ 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');
+	auth_domain = pp2_url.replace(/^(https?:)?\/\/(.*?)\/.*/, '$2');
 	debug("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
     }
 
@@ -1202,9 +1216,16 @@ function M(word) {
  * implement jQuery plugin $.pazpar2({})
  */
 function _mkws_jquery_plugin ($) {
-    // delayed debug, internal variables are set after dom ready
+    var debug_level = 1;
+
     function debug (string) {
-	setTimeout(function() { mkws.debug_function(string); }, 500);
+	if (!debug_level)
+	    return;
+
+	if (typeof console === "undefined" || typeof console.log === "undefined")
+	    return;
+
+	console.log("jquery.pazpar2: " + string);
     }
 
     function init_popup(obj) {
@@ -1220,7 +1241,7 @@ function _mkws_jquery_plugin ($) {
 	// make sure that jquery-ui was loaded afte jQuery core lib, e.g.:
 	// <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
 	if (!$.ui) {
-	    debug("Error: jquery-ui.js is missing, did you included it after jquery core in the HTML file?");
+	    debug("Error: jquery-ui.js is missing, did you include it after jQuery core in the HTML file?");
 	    return;
 	}