X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=e08958fa5b54cb04aae8201b4eb8c17a83359522;hb=96aafc9ffce3645b210d56f9120f5e62d2866d1b;hp=3dd1af987b6af410006197d76f2deaabcfc6ea5f;hpb=7d285924818fe961c40cc27201cdc20e5729fb6e;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 3dd1af9..e08958f 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -78,12 +78,6 @@ var mkws = {
 };
 
 
-// Define empty mkws_config for simple applications that don't define it.
-if (mkws_config == null || typeof mkws_config != 'object') {
-    var mkws_config = {};
-}
-
-
 mkws.log = function(string) {
     if (!mkws.log_level)
 	return;
@@ -94,7 +88,8 @@ mkws.log = function(string) {
 
     // you need to disable use strict at the top of the file!!!
     if (mkws.log_level >= 3) {
-	console.log(arguments.callee.caller);
+        // Works in Chrome; not sure about elsewhere
+	console.trace();
     } else if (mkws.log_level >= 2) {
 	console.log(">>> called from function " + arguments.callee.caller.name + ' <<<');
     }
@@ -102,14 +97,14 @@ mkws.log = function(string) {
 };
 
 
-mkws.objectWithParent = function(parent) {
-    function thing() {} // Must be function so `prototype' works
-
-    thing.prototype = parent;
-    var res = new thing();
-    thing.prototype = null;
-    return res;
-};
+// 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) {
@@ -122,10 +117,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/",
@@ -147,26 +145,25 @@ 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 = mkws.objectInheritingFrom(config_default);
+    for (var k in overrides) {
+	mkws.config[k] = overrides[k];
     }
 };
 
 
+// This code is from Douglas Crockford's article "Prototypal Inheritance in JavaScript"
+// http://javascript.crockford.com/prototypal.html
+// mkws.objectInheritingFrom behaves the same as Object.create,
+// but since the latter is not available in IE8 we can't use it.
+//
+mkws.objectInheritingFrom = function(o) {
+    function F() {}
+    F.prototype = o;
+    return new F();
+}
+
+
 // The following functions are dispatchers for team methods that
 // are called from the UI using a team-name rather than implicit
 // context.
@@ -186,6 +183,10 @@ mkws.limitQuery  = function(tname, field, value) {
     mkws.teams[tname].limitQuery(field, value);
 };
 
+mkws.limitCategory  = function(tname, id) {
+    mkws.teams[tname].limitCategory(id);
+};
+
 mkws.delimitTarget = function(tname, id) {
     mkws.teams[tname].delimitTarget(id);
 };
@@ -233,6 +234,8 @@ mkws.pagerNext = function(tname) {
 		type = cname.replace(/^mkws/, '');
 	    }
 	}
+
+        if (!teamName) teamName = "AUTO";
 	callback.call(node, teamName, type);
     }
 
@@ -301,8 +304,10 @@ mkws.pagerNext = function(tname) {
 	    log("Service proxy auth successfully done");
 	    mkws.authenticated = true;
 	    var authName = $(data).find("displayName").text();
+	    // You'd think there would be a better way to do this:
+	    var realm = $(data).find("realm:not(realmAttributes realm)").text();
 	    for (var teamName in mkws.teams) {
-		mkws.teams[teamName].queue("authenticated").publish(authName);
+		mkws.teams[teamName].queue("authenticated").publish(authName, realm);
 	    }
 
 	    runAutoSearches();
@@ -314,13 +319,38 @@ mkws.pagerNext = function(tname) {
 	log("running auto searches");
 
 	for (var teamName in mkws.teams) {
-	    mkws.teams[teamName].runAutoSearch();
+	    mkws.teams[teamName].queue("ready").publish();
 	}
     }
 
 
+    function makeWidgetsWithin(level, node) {
+        node.find('[class^="mkws"],[class*=" mkws"]').each(function() {
+            handleNodeWithTeam(this, function(tname, type) {
+                var oldHTML = this.innerHTML;
+                var myTeam = mkws.teams[tname];
+                var myWidget = widget(j, myTeam, type, this);
+                myTeam.addWidget(myWidget);
+                var newHTML = this.innerHTML;
+                if (newHTML !== oldHTML) {
+                    log("widget " + tname + ":" + type + " HTML changed from '" + oldHTML + "' to '" + newHTML + "': reparse!");
+                    makeWidgetsWithin(level+1, $(this));
+                }
+            });
+        });
+    }
+
+
     $(document).ready(function() {
-	mkws.defaultMkwsConfig();
+	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;
+	}
+	mkws.setMkwsConfig(saved_config);
 
 	for (var key in mkws.config) {
 	    if (mkws.config.hasOwnProperty(key)) {
@@ -366,15 +396,6 @@ mkws.pagerNext = function(tname) {
 	    }
 	}
 
-	// For all MKWS-classed nodes that don't have a team
-	// specified, set the team to AUTO.
-	$('[class^="mkws"],[class*=" mkws"]').each(function() {
-	    if (!this.className.match(/mkwsTeam_/)) {
-		log("adding AUTO team to node with class '" + this.className + "'");
-		$(this).addClass('mkwsTeam_AUTO');
-	    }
-	});
-
 	// Find all nodes with an MKWS class, and determine their team from
 	// the mkwsTeam_* class. Make all team objects.
 	var then = $.now();
@@ -386,19 +407,22 @@ mkws.pagerNext = function(tname) {
 		}
 	    });
 	});
-	// Second pass: make the individual widget objects. This has
-	// to be done separately, and after the team-creation, since
-	// that sometimes makes new widget nodes (e.g. creating
-	// mkwsTermlists inside mkwsResults.
-	$('[class^="mkws"],[class*=" mkws"]').each(function() {
-	    handleNodeWithTeam(this, function(tname, type) {
-		var myTeam = mkws.teams[tname];
-		var myWidget = widget(j, myTeam, type, this);
-	    });
-	});
+
+        makeWidgetsWithin(1, $(':root'));
+        
 	var now = $.now();
 	log("Walking MKWS nodes took " + (now-then) + " ms");
 
+//        for (var tName in mkws.teams) {
+//            var myTeam = mkws.teams[tName]
+//            var types = myTeam.widgetTypes();
+//            log("TEAM '" + tName + "' = " + myTeam + " has widget types " + types);
+//            for (var i = 0; i < types.length; i++) {
+//                var type = types[i];
+//                log("  has widget of type '" + type + "': " + myTeam.widget(type));
+//            }
+//        }
+
 	if (mkws.config.use_service_proxy) {
 	    authenticateSession(mkws.config.service_proxy_auth,
 				mkws.config.service_proxy_auth_domain,