X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=50eec65fd76f91d8f0c37738a4b530e8167a92ef;hb=b9d32463b38074309f2c80145094f597ae98daa3;hp=796fd2c2504c9a21ab0b0c448805d6b5a1a82279;hpb=a4549c27facf4260bf93d71ef26d7a755063d13b;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 796fd2c..50eec65 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -142,29 +142,6 @@ var mkws = { }; -// The following PubSub code is modified from the jQuery manual: -// https://api.jquery.com/jQuery.Callbacks/ -// -// Use as: -// mkws.queue("eventName").subscribe(function(param1, param2 ...) { ... }); -// mkws.queue("eventName").publish(arg1, arg2, ...); - -(function() { - var queues = {}; - mkws.queue = function(id) { - if (!queues[id]) { - var callbacks = $.Callbacks(); - queues[id] = { - publish: callbacks.fire, - subscribe: callbacks.add, - unsubscribe: callbacks.remove - }; - } - return queues[id]; - } -}()); - - // Define empty mkws_config for simple applications that don't define it. if (mkws_config == null || typeof mkws_config != 'object') { var mkws_config = {}; @@ -186,15 +163,19 @@ function widget($, team, type, node) { } else if (type === 'Stat') { promoteStat(); } else { - // Unsupported widget type: call an extension? + // ### Handle other types here } - // ### More to do here, surely: e.g. wiring into the team mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node); + return that; + + // Functions follow for promoting the regular widget object into + // widgets of specific types. These could be moved outside of the + // widget object, or even into their own source files. function promoteTargets() { - mkws.queue("targets").subscribe(function(data) { + team.queue("targets").subscribe(function(data) { if (node.length === 0) alert("huh?!"); var table ='' + @@ -221,7 +202,7 @@ function widget($, team, type, node) { function promoteStat() { - mkws.queue("stat").subscribe(function(data) { + team.queue("stat").subscribe(function(data) { if (node.length === 0) alert("huh?!"); $(node).html('' + M('Status info') + '' + @@ -231,9 +212,6 @@ function widget($, team, type, node) { '' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + ''); }); } - - - return that; } @@ -248,16 +226,17 @@ function widget($, team, type, node) { function team($, teamName) { var that = {}; var m_teamName = teamName; + that.name = function() { return m_teamName; } var m_submitted = false; var m_query; // initially undefined - var m_sort; // will be set below + var m_sortOrder; // will be set below var m_perpage; // will be set below var m_filters = []; var m_totalRec = 0; var m_curPage = 1; var m_curDetRecId = ''; var m_curDetRecData = null; - var m_debug_time = { + var m_debugTime = { // Timestamps for logging "start": $.now(), "last": $.now() @@ -268,15 +247,15 @@ function team($, teamName) { var debug = function (s) { var now = $.now(); - var timestamp = ((now - m_debug_time.start)/1000).toFixed(3) + " (+" + ((now - m_debug_time.last)/1000).toFixed(3) + ") " - m_debug_time.last = now; + var timestamp = ((now - m_debugTime.start)/1000).toFixed(3) + " (+" + ((now - m_debugTime.last)/1000).toFixed(3) + ") " + m_debugTime.last = now; mkws.debug(m_teamName + ": " + timestamp + s); } debug("start running MKWS"); - m_sort = mkws_config.sort_default; + m_sortOrder = mkws_config.sort_default; m_perpage = mkws_config.perpage_default; debug("Create main pz2 object"); @@ -309,13 +288,13 @@ function team($, teamName) { function onBytarget(data) { debug("target"); - mkws.queue("targets").publish(data); + queue("targets").publish(data); } function onStat(data) { debug("stat"); - mkws.queue("stat").publish(data); + queue("stat").publish(data); } @@ -390,9 +369,10 @@ function team($, teamName) { var detRecordDiv = document.getElementById('mkwsDet_' + teamName + '_' + data.recid); if (detRecordDiv) return; m_curDetRecData = data; + // Can't use jQuery's $('#x') syntax to find this ID, because it contains spaces. var recordDiv = document.getElementById('mkwsRecdiv_' + teamName + '_' + m_curDetRecData.recid); var html = renderDetails(m_curDetRecData); - recordDiv.innerHTML += html; + $(recordDiv).append(html); } @@ -498,7 +478,7 @@ function team($, teamName) { } - function newSearch(query, sort, targets) + function newSearch(query, sortOrder, targets) { debug("newSearch: " + query); @@ -511,7 +491,7 @@ function team($, teamName) { redrawNavi(); resetPage(); loadSelect(); - triggerSearch(query, sort, targets); + triggerSearch(query, sortOrder, targets); switchView('records'); // In case it's configured to start off as hidden m_submitted = true; } @@ -522,7 +502,7 @@ function team($, teamName) { if (!m_submitted) return false; resetPage(); loadSelect(); - m_paz.show(0, m_perpage, m_sort); + m_paz.show(0, m_perpage, m_sortOrder); return false; } @@ -562,9 +542,9 @@ function team($, teamName) { function loadSelect () { var node = findnode('.mkwsSort'); - if (node.length && node.val() != m_sort) { - debug("changing m_sort from " + m_sort + " to " + node.val()); - m_sort = node.val(); + if (node.length && node.val() != m_sortOrder) { + debug("changing m_sortOrder from " + m_sortOrder + " to " + node.val()); + m_sortOrder = node.val(); } node = findnode('.mkwsPerpage'); if (node.length && node.val() != m_perpage) { @@ -574,17 +554,17 @@ function team($, teamName) { } - function triggerSearch (query, sort, targets) + function triggerSearch (query, sortOrder, targets) { var pp2filter = ""; var pp2limit = ""; - // Re-use previous query/sort if new ones are not specified + // Re-use previous query/sort-order if new ones are not specified if (query) { m_query = query; } - if (sort) { - m_sort = sort; + if (sortOrder) { + m_sortOrder = sortOrder; } if (targets) { m_filters.push({ id: targets, name: targets }); @@ -617,7 +597,7 @@ function team($, teamName) { // We can use: params.torusquery = "udb=NAME" // Note: that won't work when running against raw pazpar2 - m_paz.search(m_query, m_perpage, m_sort, pp2filter, undefined, params); + m_paz.search(m_query, m_perpage, m_sortOrder, pp2filter, undefined, params); } @@ -867,7 +847,7 @@ function team($, teamName) { function mkwsSetLang() { - var lang = parseQuerystring().lang || mkws_config.lang; + var lang = mkws.getParameterByName("lang") || mkws_config.lang; if (!lang || !mkws.locale_lang[lang]) { mkws_config.lang = "" } else { @@ -923,7 +903,7 @@ function team($, teamName) { function mkwsHtmlSort() { - debug("HTML sort, m_sort = '" + m_sort + "'"); + debug("HTML sort, m_sortOrder = '" + m_sortOrder + "'"); var sort_html = '
\ - \ - \ - \ - \ - {{#if md-date}}\ - \ - \ - \ - \ - {{/if}}\ - {{#if md-author}}\ - \ - \ - \ - \ - {{/if}}\ - {{#if md-electronic-url}}\ - \ - \ - \ - \ - {{/if}}\ - {{#if-any location having="md-subject"}}\ - \ - \ - \ - \ - {{/if-any}}\ - \ - \ - \ - \ -
{{translate "Title"}}\ - {{md-title}}\ - {{#if md-title-remainder}}\ - ({{md-title-remainder}})\ - {{/if}}\ - {{#if md-title-responsibility}}\ - {{md-title-responsibility}}\ - {{/if}}\ -
{{translate "Date"}}{{md-date}}
{{translate "Author"}}{{md-author}}
{{translate "Links"}}\ - {{#each md-electronic-url}}\ - Link{{index1}}\ - {{/each}}\ -
{{translate "Subject"}}\ - {{#first location having="md-subject"}}\ - {{#if md-subject}}\ - {{#commaList md-subject}}\ - {{this}}{{/commaList}}\ - {{/if}}\ - {{/first}}\ -
{{translate "Locations"}}\ - {{#commaList location}}\ - {{attr "@name"}}{{/commaList}}\ -
\ -'; - } else if (name === "Summary") { - return '\ -\ - {{md-title}}\ -\ -{{#if md-title-remainder}}\ - {{md-title-remainder}}\ -{{/if}}\ -{{#if md-title-responsibility}}\ - {{md-title-responsibility}}\ -{{/if}}\ -'; + // The following PubSub code is modified from the jQuery manual: + // https://api.jquery.com/jQuery.Callbacks/ + // + // Use as: + // team.queue("eventName").subscribe(function(param1, param2 ...) { ... }); + // team.queue("eventName").publish(arg1, arg2, ...); + + var queues = {}; + var queue = function(id) { + if (!queues[id]) { + var callbacks = $.Callbacks(); + queues[id] = { + publish: callbacks.fire, + subscribe: callbacks.add, + unsubscribe: callbacks.remove + }; } - - var s = "There is no default '" + name +"' template!"; - alert(s); - return s; + return queues[id]; } + that.queue = queue; + // main (function() { @@ -1325,6 +1226,97 @@ function team($, teamName) { } + // 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.defaultTemplate = function(name) + { + if (name === 'Record') { + return '\ +\ + \ + \ + \ + \ + {{#if md-date}}\ + \ + \ + \ + \ + {{/if}}\ + {{#if md-author}}\ + \ + \ + \ + \ + {{/if}}\ + {{#if md-electronic-url}}\ + \ + \ + \ + \ + {{/if}}\ + {{#if-any location having="md-subject"}}\ + \ + \ + \ + \ + {{/if-any}}\ + \ + \ + \ + \ +
{{translate "Title"}}\ + {{md-title}}\ + {{#if md-title-remainder}}\ + ({{md-title-remainder}})\ + {{/if}}\ + {{#if md-title-responsibility}}\ + {{md-title-responsibility}}\ + {{/if}}\ +
{{translate "Date"}}{{md-date}}
{{translate "Author"}}{{md-author}}
{{translate "Links"}}\ + {{#each md-electronic-url}}\ + Link{{index1}}\ + {{/each}}\ +
{{translate "Subject"}}\ + {{#first location having="md-subject"}}\ + {{#if md-subject}}\ + {{#commaList md-subject}}\ + {{this}}{{/commaList}}\ + {{/if}}\ + {{/first}}\ +
{{translate "Locations"}}\ + {{#commaList location}}\ + {{attr "@name"}}{{/commaList}}\ +
\ +'; + } else if (name === "Summary") { + return '\ +\ + {{md-title}}\ +\ +{{#if md-title-remainder}}\ + {{md-title-remainder}}\ +{{/if}}\ +{{#if md-title-responsibility}}\ + {{md-title-responsibility}}\ +{{/if}}\ +'; + } + + var s = "There is no default '" + name +"' template!"; + alert(s); + return s; + } + + function defaultMkwsConfig() { /* default mkws config */ var config_default = {