X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=de050e02ef5711ea9ab5abc723a9498af31827c3;hb=681b0dfe6e140c03eed5776ff37a7961df0de0c7;hp=91761153c6cce3cf3f7cf44f462bb2553fb3aa04;hpb=d9ea1e26483a9f2a6ae9a441ec88937604a414cb;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 9176115..de050e0 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -106,6 +106,16 @@ mkws.objectWithParent = function(parent) {
 };
 
 
+// This function is taken from a StackOverflow answer
+// http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript/901144#901144
+mkws.getParameterByName = function(name) {
+    name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+	results = regex.exec(location.search);
+    return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+}
+
+
 mkws.registerWidgetType = function(name, fn) {
     mkws.widgetType2function[name] = fn;
     mkws.log("registered widget-type '" + name + "'");
@@ -116,10 +126,13 @@ mkws.promotionFunction = function(name) {
 };
 
 
-mkws.defaultMkwsConfig = function() {
-    mkws.config = mkws_config || {};
+mkws.setMkwsConfig = function(overrides) {
+    // Set global log_level flag early so that mkws.log() works
+    // Fall back to old "debug_level" setting for backwards compatibility
+    var tmp = overrides.log_level;
+    if (typeof(tmp) === 'undefined') tmp = overrides.debug_level;
+    if (typeof(tmp) !== 'undefined') mkws.log_level = tmp;
 
-    /* default mkws config */
     var config_default = {
 	use_service_proxy: true,
 	pazpar2_url: "//mkws.indexdata.com/service-proxy/",
@@ -141,22 +154,9 @@ mkws.defaultMkwsConfig = function() {
 	dummy: "dummy"
     };
 
-    // Set global log_level flag early so that log() works
-    // Fall back to old "debug_level" setting for backwards compatibility
-    var tmp = mkws.config.log_level;
-    if (typeof(tmp) === 'undefined') tmp = mkws.config.debug_level;
-
-    if (typeof(tmp) !== 'undefined') {
-	mkws.log_level = tmp;
-    } else if (typeof(config_default.log_level) !== 'undefined') {
-	mkws.log_level = config_default.log_level;
-    }
-
-    /* override standard config values by function parameters */
-    for (var k in config_default) {
-	if (typeof mkws.config[k] === 'undefined')
-	    mkws.config[k] = config_default[k];
-	//log("Set config: " + k + ' => ' + mkws.config[k]);
+    mkws.config = Object.create(config_default);
+    for (var k in overrides) {
+	mkws.config[k] = overrides[k];
     }
 };
 
@@ -308,13 +308,26 @@ mkws.pagerNext = function(tname) {
 	log("running auto searches");
 
 	for (var teamName in mkws.teams) {
-	    mkws.teams[teamName].runAutoSearch();
+	    mkws.teams[teamName].queue("ready").publish();
 	}
     }
 
 
+    // I don't understand why I need this copy, but I do: mkws_config
+    // is not visible inside the document.ready function, but the
+    // saved copy is.
+    var saved_config;
+    if (typeof mkws_config === 'undefined') {
+	log("setting empty config");
+	saved_config = {};
+    } else {
+	log("using config: " + $.toJSON(mkws_config));
+	saved_config = mkws_config;
+    }
+
+
     $(document).ready(function() {
-	mkws.defaultMkwsConfig();
+	mkws.setMkwsConfig(saved_config);
 
 	for (var key in mkws.config) {
 	    if (mkws.config.hasOwnProperty(key)) {