X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-core.js;h=1d4d26ed32881c8ad5f69194e6eb66db31c16dc6;hp=56e7f28cb199d57b45562c70a57b652fdf99abde;hb=a400ffb90ea4c58ac7505052e00484421d7a4e7b;hpb=e02be627cf7fde4a2e15cc31281468e3523cbc02 diff --git a/src/mkws-core.js b/src/mkws-core.js index 56e7f28..1d4d26e 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -16,6 +16,7 @@ window.mkws = { authenticated: false, authenticating: false, active: false, + logger: undefined, log_level: 1, // Will be overridden from mkws.config, but // initial value allows jQuery popup to use logging. teams: {}, @@ -28,7 +29,7 @@ window.mkws = { "Subjects": "Schlagwörter", "Sources": "Daten und Quellen", "source": "datenquelle", - "Termlists": "Termlisten", + "Facets": "Termlisten", "Next": "Weiter", "Prev": "Zurück", "Search": "Suche", @@ -57,7 +58,7 @@ window.mkws = { "Subjects": "Emner", "Sources": "Kilder", "source": "kilder", - "Termlists": "Termlists", + "Facets": "Termlists", "Next": "Næste", "Prev": "Forrige", "Search": "Søg", @@ -90,25 +91,38 @@ if (typeof(mkws_jQuery) !== "undefined") { mkws.$ = jQuery; } -mkws.log = function(string) { +mkws.logger = JL('mkws'); +var consoleAppender = JL.createConsoleAppender('consoleAppender'); +mkws.logger.setOptions({ "appenders": [consoleAppender]} ); + + +function _log(fn, string) { if (!mkws.log_level) return; - if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */ - return; - } - // you need to disable use strict at the top of the file!!! if (mkws.log_level >= 3) { // Works in Chrome; not sure about elsewhere console.trace(); } else if (mkws.log_level >= 2) { - console.log(">>> called from function " + arguments.callee.caller.name + ' <<<'); + } - console.log(string); + fn.call(mkws.logger, string); }; +mkws.log = function(x) { _log(mkws.logger.debug, x) }; +/* +trace("message with severity trace"); +debug("message with severity debug"); +info("message with severity info"); +warn("message with severity warn"); +error("message with severity error"); +fatal("message with severity fatal"); +*/ + + + // Translation function. mkws.M = function(word) { var lang = mkws.config.lang; @@ -132,6 +146,11 @@ mkws.getParameterByName = function(name, url) { mkws.registerWidgetType = function(name, fn) { + if(mkws._old2new.hasOwnProperty(name)) { + mkws.log("Warning: registerWidgetType old widget name: " + name + " => " + mkws._old2new[name]); + name = mkws._old2new[name]; + } + mkws.widgetType2function[name] = fn; mkws.log("registered widget-type '" + name + "'"); }; @@ -143,26 +162,23 @@ mkws.promotionFunction = function(name) { 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; var config_default = { use_service_proxy: true, pazpar2_url: undefined, pp2_hostname: "sp-mkws.indexdata.com", - pp2_path: "service-proxy", + pp2_path: "service-proxy/", service_proxy_auth: undefined, - sp_auth_path: "service-proxy/", + sp_auth_path: undefined, sp_auth_query: "command=auth&action=perconfig", - sp_auth_credentials: "XXX/XXX", // Should be undefined: see bug MKSP-125. + sp_auth_credentials: undefined, lang: "", sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]], perpage_options: [10, 20, 30, 50], sort_default: "relevance", perpage_default: 20, - query_width: 50, show_lang: true, /* show/hide language menu */ show_sort: true, /* show/hide sort menu */ show_perpage: true, /* show/hide perpage menu */ @@ -244,7 +260,7 @@ mkws.pazpar2_url = function() { mkws.log("using pre-baked pazpar2_url '" + mkws.config.pazpar2_url + "'"); return mkws.config.pazpar2_url; } else { - var s = document.location.protocol + "//" + mkws.config.pp2_hostname + "/" + mkws.config.pp2_path + "/"; + var s = document.location.protocol + "//" + mkws.config.pp2_hostname + "/" + mkws.config.pp2_path; mkws.log("generated pazpar2_url '" + s + "'"); return s; } @@ -295,6 +311,8 @@ mkws.log("Using window.name '" + window.name + "'"); 'MOTDContainer': 'motd-container', 'Perpage': 'per-page', 'SearchForm': 'search-form', + 'ReferenceUniverse': 'reference-universe', + 'Termlists': 'facets' }; // Annoyingly, there is no built-in way to invert a hash var _new2old = {}; @@ -304,6 +322,8 @@ mkws.log("Using window.name '" + window.name + "'"); } } + mkws._old2new = _old2new; + function handleNodeWithTeam(node, callback) { // First branch for DOM objects; second branch for jQuery objects var classes = node.className || node.attr('class'); @@ -341,7 +361,7 @@ mkws.log("Using window.name '" + window.name + "'"); teamName = "AUTO"; // Autosearch widgets don't join team AUTO if there is already an // autosearch on the team or the team has otherwise gotten a query - if (node.hasAttribute("autosearch")) { + if (node.getAttribute("autosearch")) { if (mkws.autoHasAuto || mkws.teams["AUTO"] && mkws.teams["AUTO"].config["query"]) { log("AUTO team already has a query, using unique team"); @@ -455,7 +475,7 @@ mkws.log("Using window.name '" + window.name + "'"); // This is the old version, which works by telling jQuery to // find every node that has a class beginning with "mkws". In // theory it should be slower than the class-based selector; but - // instrumentation suprisnigly shows this is consistently + // instrumentation suprisingly shows this is consistently // faster. It also has the advantage that any widgets of // non-registered types are logged as warnings rather than // silently ignored. @@ -493,7 +513,6 @@ mkws.log("Using window.name '" + window.name + "'"); var myTeam = mkws.teams[tname]; if (!myTeam) { myTeam = mkws.teams[tname] = mkws.makeTeam($, tname); - log("made MKWS team '" + tname + "'"); } var oldHTML = this.innerHTML; @@ -501,7 +520,7 @@ mkws.log("Using window.name '" + window.name + "'"); myTeam.addWidget(myWidget); var newHTML = this.innerHTML; if (newHTML !== oldHTML) { - log("widget " + tname + ":" + type + " HTML changed: reparsing"); + myTeam.log("widget " + type + " HTML changed: reparsing"); makeWidgetsWithin(level+1, $(this)); } }); @@ -569,11 +588,6 @@ mkws.log("Using window.name '" + window.name + "'"); log("using language: " + (mkws.config.lang ? mkws.config.lang : "none")); - if (mkws.config.query_width < 5 || mkws.config.query_width > 150) { - log("reset query width to " + mkws.config.query_width); - mkws.config.query_width = 50; - } - // protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp" if (mkws.pazpar2_url().match(/^\/\//)) { mkws.config.pazpar2_url = document.location.protocol + mkws.config.pazpar2_url; @@ -601,7 +615,7 @@ mkws.log("Using window.name '" + window.name + "'"); for (var tName in mkws.teams) { var myTeam = mkws.teams[tName] myTeam.makePz2(); - log("made PZ2 object for team '" + tName + "'"); + myTeam.log("made PZ2 object"); /* myTeam.visitWidgets(function(t, w) { log(" has widget of type '" + t + "': " + w); @@ -615,8 +629,9 @@ mkws.log("Using window.name '" + window.name + "'"); return config.service_proxy_auth; } else { var s = '//'; - s += config.auth_hostname ? config.auth_hostname : config.pp2_hostname; - s += '/' + config.sp_auth_path; + s += config.sp_auth_hostname ? config.sp_auth_hostname : config.pp2_hostname; + s += '/'; + s += config.sp_auth_path ? config.sp_auth_path : config.pp2_path; var q = config.sp_auth_query; if (q) { s += '?' + q;