X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=5c783a4d2a4abf8e59177749da50f68441a5fbad;hb=79350b596923a67ac966819831033ecf7a233cfa;hp=fc50e135bdd66c24ee01decd56097bfd335ec8b0;hpb=68e007c94b25548ee0a5192a1ec7011370662422;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index fc50e13..5c783a4 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -3,7 +3,7 @@ * See the file LICENSE for details */ -"use strict"; // HTML5: disable for debug_level >= 2 +"use strict"; // HTML5: disable for log_level >= 2 // Handlebars helpers @@ -76,8 +76,8 @@ Handlebars.registerHelper('index1', function(obj) { // var mkws = { authenticated: false, - debug_level: 1, // Will be overridden from mkws_config, but - // initial value allows jQuery popup to use logging. + log_level: 1, // Will be overridden from mkws_config, but + // initial value allows jQuery popup to use logging. paz: undefined, // will be set up during initialisation teams: {}, locale_lang: { @@ -172,16 +172,16 @@ function widget($, team, type, node) { var promote = type2fn[type]; if (promote) { promote(); - debug("made " + type + " widget(node=" + node + ")"); + log("made " + type + " widget(node=" + node + ")"); } else { - debug("made UNENCAPSULATED widget(type=" + type + ", node=" + node + ")"); + log("made UNENCAPSULATED widget(type=" + type + ", node=" + node + ")"); } return that; - function debug(s) { - team.debug(s); + function log(s) { + team.log(s); } // Functions follow for promoting the regular widget object into @@ -448,7 +448,7 @@ function team($, teamName) { var m_currentPage = 1; var m_currentRecordId = ''; var m_currentRecordData = null; - var m_debugTime = { + var m_logTime = { // Timestamps for logging "start": $.now(), "last": $.now() @@ -469,21 +469,21 @@ function team($, teamName) { that.set_perpage = function(val) { m_perpage = val }; - var debug = function (s) { + var log = function (s) { var now = $.now(); - var timestamp = ((now - m_debugTime.start)/1000).toFixed(3) + " (+" + ((now - m_debugTime.last)/1000).toFixed(3) + ") " - m_debugTime.last = now; + var timestamp = ((now - m_logTime.start)/1000).toFixed(3) + " (+" + ((now - m_logTime.last)/1000).toFixed(3) + ") " + m_logTime.last = now; - mkws.debug(m_teamName + ": " + timestamp + s); + mkws.log(m_teamName + ": " + timestamp + s); } - that.debug = debug; + that.log = log; - debug("start running MKWS"); + log("start running MKWS"); m_sortOrder = mkws_config.sort_default; m_perpage = mkws_config.perpage_default; - debug("Create main pz2 object"); + log("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 // autoInit is set to true on default @@ -505,32 +505,32 @@ function team($, teamName) { // pz2.js event handlers: // function onInit() { - debug("init"); + log("init"); m_paz.stat(); m_paz.bytarget(); } function onBytarget(data) { - debug("target"); + log("target"); queue("targets").publish(data); } function onStat(data) { - debug("stat"); + log("stat"); queue("stat").publish(data); } function onTerm(data) { - debug("term"); + log("term"); queue("termlists").publish(data); } function onShow(data, teamName) { - debug("show"); + log("show"); m_totalRecordCount = data.merged; queue("pager").publish(data); queue("records").publish(data); @@ -538,7 +538,7 @@ function team($, teamName) { function onRecord(data, args, teamName) { - debug("record"); + log("record"); // FIXME: record is async!! clearTimeout(m_paz.recordTimer); // ##### restrict to current team @@ -593,7 +593,7 @@ function team($, teamName) { function newSearch(query, sortOrder, targets) { - debug("newSearch: " + query); + log("newSearch: " + query); if (mkws_config.use_service_proxy && !mkws.authenticated) { alert("searching before authentication"); @@ -610,7 +610,7 @@ function team($, teamName) { // limit by target functions that.limitTarget = function (id, name) { - debug("limitTarget(id=" + id + ", name=" + name + ")"); + log("limitTarget(id=" + id + ", name=" + name + ")"); m_filters.push({ id: id, name: name }); triggerSearch(); return false; @@ -620,7 +620,7 @@ function team($, teamName) { // limit the query after clicking the facet that.limitQuery = function (field, value) { - debug("limitQuery(field=" + field + ", value=" + value + ")"); + log("limitQuery(field=" + field + ", value=" + value + ")"); m_filters.push({ field: field, value: value }); triggerSearch(); return false; @@ -629,14 +629,14 @@ function team($, teamName) { that.delimitTarget = function (id) { - debug("delimitTarget(id=" + id + ")"); + log("delimitTarget(id=" + id + ")"); var newFilters = []; for (var i in m_filters) { var filter = m_filters[i]; if (filter.id) { - debug("delimitTarget() removing filter " + $.toJSON(filter)); + log("delimitTarget() removing filter " + $.toJSON(filter)); } else { - debug("delimitTarget() keeping filter " + $.toJSON(filter)); + log("delimitTarget() keeping filter " + $.toJSON(filter)); newFilters.push(filter); } } @@ -649,16 +649,16 @@ function team($, teamName) { that.delimitQuery = function (field, value) { - debug("delimitQuery(field=" + field + ", value=" + value + ")"); + log("delimitQuery(field=" + field + ", value=" + value + ")"); var newFilters = []; for (var i in m_filters) { var filter = m_filters[i]; if (filter.field && field == filter.field && value == filter.value) { - debug("delimitQuery() removing filter " + $.toJSON(filter)); + log("delimitQuery() removing filter " + $.toJSON(filter)); } else { - debug("delimitQuery() keeping filter " + $.toJSON(filter)); + log("delimitQuery() keeping filter " + $.toJSON(filter)); newFilters.push(filter); } } @@ -702,7 +702,7 @@ function team($, teamName) { if (pp2filter) pp2filter += ","; if (filter.id.match(/^[a-z:]+[=~]/)) { - debug("filter '" + filter.id + "' already begins with SETTING OP"); + log("filter '" + filter.id + "' already begins with SETTING OP"); } else { filter.id = 'pz:id=' + filter.id; } @@ -719,7 +719,7 @@ function team($, teamName) { params.limit = pp2limit; } - debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params)); + log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params)); // We can use: params.torusquery = "udb=NAME" // Note: that won't work when running against raw pazpar2 @@ -808,7 +808,7 @@ function team($, teamName) { return; } // request the record - debug("showDetails() requesting record '" + recId + "'"); + log("showDetails() requesting record '" + recId + "'"); m_paz.record(recId); } @@ -822,7 +822,7 @@ function team($, teamName) { if (mkws_config.show_lang) mkwsHtmlLang(); - debug("HTML search form"); + log("HTML search form"); mkws.handleNodeWithTeam(findnode('.mkwsSearch'), function(tname) { this.html('\
'); }); - debug("HTML records"); + log("HTML records"); // If the team has a .mkwsResults, populate it in the usual // way. If not, assume that it's a smarter application that // defines its own subcomponents, some or all of the @@ -893,7 +893,7 @@ function team($, teamName) { mkws_config.lang = lang; } - debug("Locale language: " + (mkws_config.lang ? mkws_config.lang : "none")); + log("Locale language: " + (mkws_config.lang ? mkws_config.lang : "none")); return mkws_config.lang; } @@ -920,7 +920,7 @@ function team($, teamName) { if (lang_options.length == 0 || toBeIncluded[lang_default]) list.push(lang_default); - debug("Language menu for: " + list.join(", ")); + log("Language menu for: " + list.join(", ")); /* the HTML part */ var data = ""; @@ -942,7 +942,7 @@ function team($, teamName) { function mkwsHtmlSort() { - debug("HTML sort, m_sortOrder = '" + m_sortOrder + "'"); + log("HTML sort, m_sortOrder = '" + m_sortOrder + "'"); var sort_html = '