X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=351e01e48c8ad87f50b77c3789e378bd4e15a3d0;hb=23b60f99a77df0448ca337205716ea682b469611;hp=9893577b510f182d86d1593d36ec5cdb20eb1795;hpb=91f43e22a13194f7d3d19539b380292629e4699e;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 9893577..2e0c5fd 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -1,318 +1,311 @@ -/*! MKWS, the MasterKey Widget Set. Copyright (C) 2013-2014, Index Data */ +/*! MKWS, the MasterKey Widget Set. + * Copyright (C) 2013-2014 Index Data + * See the file LICENSE for details + */ "use strict"; // HTML5: disable for debug_level >= 2 -// Some functions are visible to be called from outside code, namely -// generated HTML: mkws.switchView(), showDetails(), limitTarget(), -// limitQuery(), delimitTarget(), delimitQuery(), pagerPrev(), -// pagerNext(), showPage() -// Set up global mkws object. Contains a hash of session objects, -// indexed by windowid. -var mkws = { - authenticated: false, - sessions: {} -}; +// Handlebars helpers +Handlebars.registerHelper('json', function(obj) { + return $.toJSON(obj); +}); -mkws.locale_lang = { - "de": { - "Authors": "Autoren", - "Subjects": "Schlagwörter", - "Sources": "Daten und Quellen", - "Termlists": "Termlisten", - "Next": "Weiter", - "Prev": "Zurück", - "Search": "Suche", - "Sort by": "Sortieren nach", - "and show": "und zeige", - "per page": "pro Seite", - "Displaying": "Zeige", - "to": "von", - "of": "aus", - "found": "gefunden", - "Title": "Titel", - "Author": "Autor", - "Date": "Datum", - "Subject": "Schlagwort", - "Location": "Ort", - "Records": "Datensätze", - "Targets": "Datenbanken", - - "dummy": "dummy" - }, - - "da": { - "Authors": "Forfattere", - "Subjects": "Emner", - "Sources": "Kilder", - "Termlists": "Termlists", - "Next": "Næste", - "Prev": "Forrige", - "Search": "Søg", - "Sort by": "Sorter efter", - "and show": "og vis", - "per page": "per side", - "Displaying": "Viser", - "to": "til", - "of": "ud af", - "found": "fandt", - "Title": "Title", - "Author": "Forfatter", - "Date": "Dato", - "Subject": "Emneord", - "Location": "Lokation", - "Records": "Poster", - "Targets": "Baser", - - "dummy": "dummy" - } -}; -// Define empty mkws_config for simple applications that don't define it. -if (mkws_config == null || typeof mkws_config != 'object') { - var mkws_config = {}; -} +Handlebars.registerHelper('translate', function(s) { + return mkws.M(s); +}); -// wrapper for jQuery lib -function _make_mkws_team($, teamName) { - if (console && console.log) - console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")"); - // call this function only once - if (mkws.init) { - alert("_make_mkws_team() called twice: how did that happen?!"); - return; - } +// We need {{attr '@name'}} because Handlebars can't parse {{@name}} +Handlebars.registerHelper('attr', function(attrName) { + return this[attrName]; +}); - var m_sort = 'relevance'; - var m_filters = []; - // keep time state for debugging - var m_debug_time = { - "start": $.now(), - "last": $.now() - }; - - mkws.debug_function = function (string) { - if (!mkws.debug_level) - return; - - if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */ - return; +/* + * Use as follows: {{#if-any NAME1 having="NAME2"}} + * Applicable when NAME1 is the name of an array + * The guarded code runs only if at least one element of the NAME1 + * array has a subelement called NAME2. + */ +Handlebars.registerHelper('if-any', function(items, options) { + var having = options.hash.having; + for (var i in items) { + var item = items[i] + if (!having || item[having]) { + return options.fn(this); } + } + return ""; +}); - 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; - // you need to disable use strict at the top of the file!!! - if (mkws.debug_level >= 3) { - console.log(timestamp + arguments.callee.caller); - } else if (mkws.debug_level >= 2) { - console.log(timestamp + ">>> called from function " + arguments.callee.caller.name + ' <<<'); +Handlebars.registerHelper('first', function(items, options) { + var having = options.hash.having; + for (var i in items) { + var item = items[i] + if (!having || item[having]) { + return options.fn(item); } - console.log(timestamp + string); } - var debug = mkws.debug_function; // local alias - debug("start running MKWS"); + return ""; +}); - Handlebars.registerHelper('json', function(obj) { - return $.toJSON(obj); - }); +Handlebars.registerHelper('commaList', function(items, options) { + var out = ""; + for (var i in items) { + if (i > 0) out += ", "; + out += options.fn(items[i]) + } - Handlebars.registerHelper('translate', function(s) { - debug("translating '" + s + "'"); - return M(s); - }); + return out; +}); - // We need {{attr '@name'}} because Handlebars can't parse {{@name}} - Handlebars.registerHelper('attr', function(attrName) { - return this[attrName]; - }); +Handlebars.registerHelper('index1', function(obj) { + return obj.data.index + 1; +}); - /* - * Use as follows: {{#if-any NAME1 having="NAME2"}} - * Applicable when NAME1 is the name of an array - * The guarded code runs only if at least one element of the NAME1 - * array has a subelement called NAME2. - */ - Handlebars.registerHelper('if-any', function(items, options) { - var having = options.hash.having; - for (var i in items) { - var item = items[i] - if (!having || item[having]) { - return options.fn(this); - } + +// Set up global mkws object. Contains truly global state such as SP +// authentication, and a hash of team objects, indexed by windowid. +// +var mkws = { + authenticated: false, + debug_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: { + "de": { + "Authors": "Autoren", + "Subjects": "Schlagwörter", + "Sources": "Daten und Quellen", + "source": "datenquelle", + "Termlists": "Termlisten", + "Next": "Weiter", + "Prev": "Zurück", + "Search": "Suche", + "Sort by": "Sortieren nach", + "and show": "und zeige", + "per page": "pro Seite", + "Displaying": "Zeige", + "to": "von", + "of": "aus", + "found": "gefunden", + "Title": "Titel", + "Author": "Autor", + "author": "autor", + "Date": "Datum", + "Subject": "Schlagwort", + "subject": "schlagwort", + "Location": "Ort", + "Records": "Datensätze", + "Targets": "Datenbanken", + + "dummy": "dummy" + }, + + "da": { + "Authors": "Forfattere", + "Subjects": "Emner", + "Sources": "Kilder", + "source": "kilder", + "Termlists": "Termlists", + "Next": "Næste", + "Prev": "Forrige", + "Search": "Søg", + "Sort by": "Sorter efter", + "and show": "og vis", + "per page": "per side", + "Displaying": "Viser", + "to": "til", + "of": "ud af", + "found": "fandt", + "Title": "Title", + "Author": "Forfatter", + "author": "forfatter", + "Date": "Dato", + "Subject": "Emneord", + "subject": "emneord", + "Location": "Lokation", + "Records": "Poster", + "Targets": "Baser", + + "dummy": "dummy" } - return ""; - }); + } +}; - Handlebars.registerHelper('first', function(items, options) { - var having = options.hash.having; - for (var i in items) { - var item = items[i] - if (!having || item[having]) { - return options.fn(item); - } - } - return ""; - }); +// 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]; + } +}()); - Handlebars.registerHelper('commaList', function(items, options) { - var out = ""; +// Define empty mkws_config for simple applications that don't define it. +if (mkws_config == null || typeof mkws_config != 'object') { + var mkws_config = {}; +} - for (var i in items) { - if (i > 0) out += ", "; - out += options.fn(items[i]) - } - return out; - }); +// Factory function for widget objects. +function widget($, team, type, node) { + var that = { + team: team, + type: type, + node: node + }; + // ### More to do here, surely: e.g. wiring into the team + mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node); - { + return that; +} - /* default mkws config */ - var config_default = { - use_service_proxy: true, - pazpar2_url: "http://mkws.indexdata.com/service-proxy/", - service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth", - 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 */ - lang_options: [], /* display languages links for given languages, [] for all */ - facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */ - responsive_design_width: undefined, /* a page with less pixel width considered as narrow */ - debug_level: 1, /* debug level for development: 0..2 */ - dummy: "dummy" - }; +// Factory function for team objects. As much as possible, this uses +// only member variables (prefixed "m_") and inner functions with +// private scope. Some functions are visibl as member-functions to be +// called from outside code -- specifically, from generated +// HTML. These functions are that.switchView(), showDetails(), +// limitTarget(), limitQuery(), delimitTarget(), delimitQuery(), +// pagerPrev(), pagerNext(), showPage(). +// +function team($, teamName) { + var that = {}; + var m_teamName = teamName; + var m_submitted = false; + var m_query; // initially undefined + var m_sort; // 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 = { + // Timestamps for logging + "start": $.now(), + "last": $.now() + }; + var m_paz; // will be initialised below + var m_template = {}; - /* set global debug_level flag early */ - if (typeof mkws_config.debug_level !== 'undefined') { - mkws.debug_level = mkws_config.debug_level; - } else if (typeof config_default.debug_level !== 'undefined') { - mkws.debug_level = config_default.debug_level; - } - // make sure the mkws_config is a valid hash - if (!$.isPlainObject(mkws_config)) { - debug("ERROR: mkws_config is not an JS object, ignore it...."); - mkws_config = {}; - } + 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; - /* 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]; - debug("Set config: " + k + ' => ' + mkws_config[k]); - } + mkws.debug(m_teamName + ": " + timestamp + s); } + debug("start running MKWS"); m_sort = mkws_config.sort_default; debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to m_sort"); - if (mkws_config.query_width < 5 || mkws_config.query_width > 150) { - debug("Reset query width: " + mkws_config.query_width); - mkws_config.query_width = 50; - } - - for (var key in mkws_config) { - if (mkws_config.hasOwnProperty(key)) { - if (key.match(/^language_/)) { - var lang = key.replace(/^language_/, ""); - // Copy custom languages into list - mkws.locale_lang[lang] = mkws_config[key]; - debug("Added locally configured language '" + lang + "'"); - } - } - } - - // protocol independend link for pazpar2: "//mkws/sp" -> "https://mkws/sp" + // protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp" if (mkws_config.pazpar2_url.match(/^\/\//)) { mkws_config.pazpar2_url = document.location.protocol + mkws_config.pazpar2_url; - debug("adjust protocol independend links: " + mkws_config.pazpar2_url); + debug("adjust protocol independent links: " + mkws_config.pazpar2_url); } debug("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 - var m_paz = new pz2( { "onshow": my_onshow, - "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way - "pazpar2path": mkws_config.pazpar2_url, - "oninit": my_oninit, - "onstat": my_onstat, - "onterm": my_onterm, - "termlist": "xtargets,subject,author", - "onbytarget": my_onbytarget, - "usesessions" : mkws_config.use_service_proxy ? false : true, - "showResponseType": '', // or "json" (for debugging?) - "onrecord": my_onrecord } ); - - // some state vars - var curPage = 1; - var recPerPage = 20; - var totalRec = 0; - var curDetRecId = ''; - var curDetRecData = null; - var submitted = false; - var SourceMax = 16; - var SubjectMax = 10; - var AuthorMax = 10; + m_paz = new pz2({ "onshow": my_onshow, + "windowid": teamName, + "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way + "pazpar2path": mkws_config.pazpar2_url, + "oninit": my_oninit, + "onstat": my_onstat, + "onterm": (mkws_config.facets.length ? my_onterm : undefined), + "termlist": mkws_config.facets.join(','), + "onbytarget": my_onbytarget, + "usesessions" : mkws_config.use_service_proxy ? false : true, + "showResponseType": '', // or "json" (for debugging?) + "onrecord": my_onrecord }); if (!isNaN(parseInt(mkws_config.perpage_default))) { - recPerPage = parseInt(mkws_config.perpage_default); + m_perpage = parseInt(mkws_config.perpage_default); } + + // Finds the node of the specified class within the current team + // Multiple OR-clauses separated by commas are handled + // More complex cases may not work + // + function findnode(selector, teamName) { + teamName = teamName || m_teamName; + + selector = selector.split(',').map(function(s) { + return s + '.mkwsTeam_' + teamName; + }).join(','); + + return $(selector); + } + + // // pz2.js event handlers: // - function my_oninit() { + function my_oninit(teamName) { + debug("init"); m_paz.stat(); m_paz.bytarget(); } - function my_onshow(data) { - totalRec = data.merged; - // move it out - var pager = document.getElementById("mkwsPager"); - if (pager) { - pager.innerHTML = ""; - pager.innerHTML +='
' + M('Displaying') + ': ' - + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) + - ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': ' - + data.total + ')
'; - drawPager(pager); + + function my_onshow(data, teamName) { + debug("show"); + m_totalRec = data.merged; + + var pager = findnode(".mkwsPager"); + if (pager.length) { + pager.html(drawPager(data)) } - // navi - var results = document.getElementById("mkwsRecords"); + var results = findnode(".mkwsRecords"); + if (!results.length) + return; var html = []; for (var i = 0; i < data.hits.length; i++) { var hit = data.hits[i]; - html.push('
', + html.push('
', renderSummary(hit), '
'); - if (hit.recid == curDetRecId) { - html.push(renderDetails(curDetRecData)); + if (hit.recid == m_curDetRecId) { + if (m_curDetRecData) + html.push(renderDetails(m_curDetRecData)); } } - replaceHtml(results, html.join('')); + results.html(html.join('')); } @@ -320,67 +313,75 @@ function _make_mkws_team($, teamName) { { var template = loadTemplate("Summary"); hit._id = "mkwsRec_" + hit.recid; - hit._onclick = "mkws.showDetails(this.id);return false;" + hit._onclick = "mkws.showDetails('" + m_teamName + "', this.id);return false;" return template(hit); } - function my_onstat(data) { - var stat = document.getElementById("mkwsStat"); - if (stat == null) + function my_onstat(data, teamName) { + debug("stat"); + var stat = findnode('.mkwsStat'); + if (stat.length === 0) return; - stat.innerHTML = '' + M('Status info') + '' + + stat.html('' + M('Status info') + '' + ' -- ' + '' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '' + ' -- ' + - '' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + ''; + '' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + ''); } - function my_onterm(data) { - // no facets + + function my_onterm(data, teamName) { + debug("term"); + var node = findnode(".mkwsTermlists"); + if (node.length == 0) return; + + // no facets: this should never happen if (!mkws_config.facets || mkws_config.facets.length == 0) { - $("#mkwsTermlists").hide(); + alert("my_onterm called even though we have no facets: " + $.toJSON(data)); + node.hide(); return; } // display if we first got results - $("#mkwsTermlists").show(); + node.show(); var acc = []; acc.push('
' + M('Termlists') + '
'); var facets = mkws_config.facets; for(var i = 0; i < facets.length; i++) { - if (facets[i] == "sources") { - add_single_facet(acc, "Sources", data.xtargets, SourceMax, null); - } else if (facets[i] == "subjects") { - add_single_facet(acc, "Subjects", data.subject, SubjectMax, "subject"); - } else if (facets[i] == "authors") { - add_single_facet(acc, "Authors", data.author, AuthorMax, "author"); + if (facets[i] == "xtargets") { + add_single_facet(acc, "Sources", data.xtargets, 16, null); + } else if (facets[i] == "subject") { + add_single_facet(acc, "Subjects", data.subject, 10, "subject"); + } else if (facets[i] == "author") { + add_single_facet(acc, "Authors", data.author, 10, "author"); } else { alert("bad facet configuration: '" + facets[i] + "'"); } } - var termlist = document.getElementById("mkwsTermlists"); - if (termlist) - replaceHtml(termlist, acc.join('')); + node.html(acc.join('')); } + function add_single_facet(acc, caption, data, max, pzIndex) { - acc.push('
'); + acc.push('
'); acc.push('
' + M(caption) + '
'); - for (var i = 0; i < data.length && i < max; i++ ) { + for (var i = 0; i < data.length && i < max; i++) { acc.push('
'); acc.push('' + data[i].name + '' + ' ' + data[i].freq + ''); @@ -389,22 +390,36 @@ function _make_mkws_team($, teamName) { acc.push('
'); } - function my_onrecord(data) { + + function target_filtered(id) { + for (var i = 0; i < m_filters.length; i++) { + if (m_filters[i].id === id || + m_filters[i].id === 'pz:id=' + id) { + return true; + } + } + return false; + } + + + function my_onrecord(data, args, teamName) { + debug("record: teamName=" + teamName + ", m_teamName=" + m_teamName); // FIXME: record is async!! clearTimeout(m_paz.recordTimer); // in case on_show was faster to redraw element - var detRecordDiv = document.getElementById('mkwsDet_'+data.recid); + var detRecordDiv = document.getElementById('mkwsDet_' + teamName + '_' + data.recid); if (detRecordDiv) return; - curDetRecData = data; - var recordDiv = document.getElementById('mkwsRecdiv_'+curDetRecData.recid); - var html = renderDetails(curDetRecData); + m_curDetRecData = data; + var recordDiv = document.getElementById('mkwsRecdiv_' + teamName + '_' + m_curDetRecData.recid); + var html = renderDetails(m_curDetRecData); recordDiv.innerHTML += html; } - function my_onbytarget(data) { - var targetDiv = document.getElementById("mkwsBytarget"); + + function my_onbytarget(data, teamName) { + debug("target"); + var targetDiv = findnode('.mkwsBytarget'); if (!targetDiv) { - // No mkwsTargets div. return; } @@ -416,7 +431,7 @@ function _make_mkws_team($, teamName) { '' + M('State') + '' + ''; - for (var i = 0; i < data.length; i++ ) { + for (var i = 0; i < data.length; i++) { table += "" + data[i].id + "" + data[i].hits + "" + data[i].diagnostic + @@ -425,33 +440,29 @@ function _make_mkws_team($, teamName) { } table += ''; - targetDiv.innerHTML = table; + targetDiv.html(table); } //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// - // wait until the DOM is ready - function domReady () - { - document.mkwsSearchForm.onsubmit = onFormSubmitEventHandler; - document.mkwsSearchForm.mkwsQuery.value = ''; - if (document.mkwsSelect) { - if (document.mkwsSelect.mkwsSort) - document.mkwsSelect.mkwsSort.onchange = onSelectDdChange; - if (document.mkwsSelect.mkwsPerpage) - document.mkwsSelect.mkwsPerpage.onchange = onSelectDdChange; - } - } // when search button pressed + // ### This is closure, so can always just operate on its own team function onFormSubmitEventHandler() { - newSearch(document.mkwsSearchForm.mkwsQuery.value); + mkws.handle_node_with_team(this, function (tname) { + var val = findnode('.mkwsQuery').val(); + mkws.teams[tname].newSearch(val); + }); + return false; } - function newSearch(query, sort, targets, windowid) + + // ### won't need to be externally visible once onFormSubmitEventHandler() is fixed. + // ### doesn't need windowid + that.newSearch = function(query, sort, targets, windowid) { debug("newSearch: " + query); @@ -461,29 +472,33 @@ function _make_mkws_team($, teamName) { } m_filters = [] - redraw_navi(); // ### should use windowid - resetPage(); // ### the globals it resents should be indexed by windowid - loadSelect(); // ### should use windowid + redraw_navi(); + resetPage(); + loadSelect(); triggerSearch(query, sort, targets, windowid); - mkws.switchView('records'); // In case it's configured to start off as hidden - submitted = true; + that.switchView('records'); // In case it's configured to start off as hidden + m_submitted = true; } + function onSelectDdChange() { - if (!submitted) return false; + if (!m_submitted) return false; resetPage(); loadSelect(); - m_paz.show(0, recPerPage, m_sort); + m_paz.show(0, m_perpage, m_sort); return false; } + function resetPage() { - curPage = 1; - totalRec = 0; + m_curPage = 1; + m_totalRec = 0; } + + // ### doesn't need windowid function triggerSearch (query, sort, targets, windowid) { var pp2filter = ""; @@ -491,7 +506,7 @@ function _make_mkws_team($, teamName) { // Re-use previous query/sort if new ones are not specified if (query) { - mkws.query = query; + m_query = query; } if (sort) { m_sort = sort; @@ -526,26 +541,34 @@ function _make_mkws_team($, teamName) { if (windowid) { params.windowid = windowid; } - debug("triggerSearch(" + mkws.query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params)); + debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params)); - m_paz.search(mkws.query, recPerPage, m_sort, pp2filter, undefined, params); + // 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); } + function loadSelect () { - if (document.mkwsSelect) { - if (document.mkwsSelect.mkwsSort) - m_sort = document.mkwsSelect.mkwsSort.value; - if (document.mkwsSelect.mkwsPerpage) - recPerPage = document.mkwsSelect.mkwsPerpage.value; + 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(); + } + node = findnode('.mkwsPerpage'); + if (node.length && node.val() != m_perpage) { + debug("changing m_perpage from " + m_perpage + " to " + node.val()); + m_perpage = node.val(); } } - // limit the query after clicking the facet - mkws.limitQuery = function (field, value) + + // limit by target functions + that.limitTarget = function (id, name) { - debug("limitQuery(field=" + field + ", value=" + value + ")"); - m_filters.push({ field: field, value: value }); + debug("limitTarget(id=" + id + ", name=" + name + ")"); + m_filters.push({ id: id, name: name }); redraw_navi(); resetPage(); loadSelect(); @@ -553,11 +576,12 @@ function _make_mkws_team($, teamName) { return false; } - // limit by target functions - mkws.limitTarget = function (id, name) + + // limit the query after clicking the facet + that.limitQuery = function (field, value) { - debug("limitTarget(id=" + id + ", name=" + name + ")"); - m_filters.push({ id: id, name: name }); + debug("limitQuery(field=" + field + ", value=" + value + ")"); + m_filters.push({ field: field, value: value }); redraw_navi(); resetPage(); loadSelect(); @@ -565,15 +589,14 @@ function _make_mkws_team($, teamName) { return false; } - mkws.delimitQuery = function (field, value) + + that.delimitTarget = function (id) { - debug("delimitQuery(field=" + field + ", value=" + value + ")"); + debug("delimitTarget(id=" + id + ")"); var newFilters = []; for (var i in m_filters) { var filter = m_filters[i]; - if (filter.field && - field == filter.field && - value == filter.value) { + if (filter.id) { debug("delimitTarget() removing filter " + $.toJSON(filter)); } else { debug("delimitTarget() keeping filter " + $.toJSON(filter)); @@ -590,16 +613,18 @@ function _make_mkws_team($, teamName) { } - mkws.delimitTarget = function (id) + that.delimitQuery = function (field, value) { - debug("delimitTarget(id=" + id + ")"); + debug("delimitQuery(field=" + field + ", value=" + value + ")"); var newFilters = []; for (var i in m_filters) { var filter = m_filters[i]; - if (filter.id) { - debug("delimitTarget() removing filter " + $.toJSON(filter)); + if (filter.field && + field == filter.field && + value == filter.value) { + debug("delimitQuery() removing filter " + $.toJSON(filter)); } else { - debug("delimitTarget() keeping filter " + $.toJSON(filter)); + debug("delimitQuery() keeping filter " + $.toJSON(filter)); newFilters.push(filter); } } @@ -615,7 +640,7 @@ function _make_mkws_team($, teamName) { function redraw_navi () { - var navi = document.getElementById('mkwsNavi'); + var navi = findnode('.mkwsNavi'); if (!navi) return; var text = ""; @@ -625,51 +650,56 @@ function _make_mkws_team($, teamName) { } var filter = m_filters[i]; if (filter.id) { - text += 'Source: ' + filter.name + ''; + text += M('source') + ': ' + filter.name + ''; } else { - text += filter.field + ': ' + filter.value + ''; } } - navi.innerHTML = text; + navi.html(text); } - function drawPager (pagerDiv) + function drawPager (data) { + var s = '
' + M('Displaying') + ': ' + + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) + + ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': ' + + data.total + ')
'; + //client indexes pages from 1 but pz2 from 0 var onsides = 6; - var pages = Math.ceil(totalRec / recPerPage); + var pages = Math.ceil(m_totalRec / m_perpage); - var firstClkbl = ( curPage - onsides > 0 ) - ? curPage - onsides + var firstClkbl = (m_curPage - onsides > 0) + ? m_curPage - onsides : 1; var lastClkbl = firstClkbl + 2*onsides < pages ? firstClkbl + 2*onsides : pages; - var prev = '<< ' + M('Prev') + ' | '; - if (curPage > 1) - prev = '' + var prev = '<< ' + M('Prev') + ' | '; + if (m_curPage > 1) + prev = '' +'<< ' + M('Prev') + ' | '; var middle = ''; for(var i = firstClkbl; i <= lastClkbl; i++) { var numLabel = i; - if(i == curPage) + if(i == m_curPage) numLabel = '' + i + ''; - middle += ' ' + middle += ' ' + numLabel + ' '; } - var next = ' | ' + M('Next') + ' >>'; - if (pages - curPage > 0) - next = ' | ' + var next = ' | ' + M('Next') + ' >>'; + if (pages - m_curPage > 0) + next = ' | ' + M('Next') + ' >>'; var predots = ''; @@ -680,122 +710,119 @@ function _make_mkws_team($, teamName) { if (lastClkbl < pages) postdots = '...'; - pagerDiv.innerHTML += '
' + s += '
' + prev + predots + middle + postdots + next + '
'; + + return s; } - mkws.showPage = function (pageNum) + + that.showPage = function (pageNum) { - curPage = pageNum; - m_paz.showPage( curPage - 1 ); + m_curPage = pageNum; + m_paz.showPage(m_curPage - 1); } - // simple paging functions - mkws.pagerNext = function () { - if ( totalRec - recPerPage*curPage > 0) { + // simple paging functions + that.pagerNext = function () { + if (m_totalRec - m_perpage*m_curPage > 0) { m_paz.showNext(); - curPage++; + m_curPage++; } } - mkws.pagerPrev = function () { - if ( m_paz.showPrev() != false ) - curPage--; - } - // switching view between targets and records + that.pagerPrev = function () { + if (m_paz.showPrev() != false) + m_curPage--; + } - mkws.switchView = function(view) { - debug("switchView: " + view); - var targets = document.getElementById('mkwsTargets'); - var results = document.getElementById('mkwsResults') || - document.getElementById('mkwsRecords'); - var blanket = document.getElementById('mkwsBlanket'); - var motd = document.getElementById('mkwsMOTD'); + // switching view between targets and records + that.switchView = function(view) { + var targets = findnode('.mkwsTargets'); + var results = findnode('.mkwsResults,.mkwsRecords'); + var blanket = findnode('.mkwsBlanket'); + var motd = findnode('.mkwsMOTD'); switch(view) { case 'targets': - if (targets) targets.style.display = "block"; - if (results) results.style.display = "none"; - if (blanket) blanket.style.display = "none"; - if (motd) motd.style.display = "none"; + if (targets) targets.css('display', 'block'); + if (results) results.css('display', 'none'); + if (blanket) blanket.css('display', 'none'); + if (motd) motd.css('display', 'none'); break; case 'records': - if (targets) targets.style.display = "none"; - if (results) results.style.display = "block"; - if (blanket) blanket.style.display = "block"; - if (motd) motd.style.display = "none"; + if (targets) targets.css('display', 'none'); + if (results) results.css('display', 'block'); + if (blanket) blanket.css('display', 'block'); + if (motd) motd.css('display', 'none'); break; case 'none': - if (targets) targets.style.display = "none"; - if (results) results.style.display = "none"; - if (blanket) blanket.style.display = "none"; - if (motd) motd.style.display = "none"; + alert("mkws.switchView(" + m_teamName + ", 'none') shouldn't happen"); + if (targets) targets.css('display', 'none'); + if (results) results.css('display', 'none'); + if (blanket) blanket.css('display', 'none'); + if (motd) motd.css('display', 'none'); break; default: alert("Unknown view '" + view + "'"); } } + // detailed record drawing - mkws.showDetails = function (prefixRecId) { + that.showDetails = function (prefixRecId) { var recId = prefixRecId.replace('mkwsRec_', ''); - var oldRecId = curDetRecId; - curDetRecId = recId; + var oldRecId = m_curDetRecId; + m_curDetRecId = recId; // remove current detailed view if any - var detRecordDiv = document.getElementById('mkwsDet_'+oldRecId); + var detRecordDiv = document.getElementById('mkwsDet_' + m_teamName + '_' + oldRecId); // lovin DOM! if (detRecordDiv) detRecordDiv.parentNode.removeChild(detRecordDiv); // if the same clicked, just hide if (recId == oldRecId) { - curDetRecId = ''; - curDetRecData = null; + m_curDetRecId = ''; + m_curDetRecData = null; return; } // request the record + debug("showDetails() requesting record '" + recId + "'"); m_paz.record(recId); } - function replaceHtml(el, html) { - var oldEl = typeof el === "string" ? document.getElementById(el) : el; - /*@cc_on // Pure innerHTML is slightly faster in IE - oldEl.innerHTML = html; - return oldEl; - @*/ - var newEl = oldEl.cloneNode(false); - newEl.innerHTML = html; - oldEl.parentNode.replaceChild(newEl, oldEl); - /* Since we just removed the old element from the DOM, return a reference - to the new element, which can be used to restore variable references. */ - return newEl; - }; function renderDetails(data, marker) { var template = loadTemplate("Record"); var details = template(data); - return '
' + details + '
'; + return '
' + details + '
'; } function loadTemplate(name) { - var template = mkws['template' + name]; + var template = m_template[name]; if (template === undefined) { - var source = $("#mkwsTemplate" + name).html(); + // Fall back to generic template if there is no team-specific one + var node = findnode(".mkwsTemplate_" + name); + if (!node.length) { + node = findnode(".mkwsTemplate_" + name, "ALL"); + } + + var source = node.html(); if (!source) { source = defaultTemplate(name); } template = Handlebars.compile(source); debug("compiled template '" + name + "'"); - mkws['template' + name] = template; + m_template[name] = template; } return template; @@ -833,10 +860,10 @@ function _make_mkws_team($, teamName) { {{/if}}\ {{#if md-electronic-url}}\ \ - {{translate "URL"}}\ + {{translate "Links"}}\ \ {{#each md-electronic-url}}\ - {{this}}
\ + Link{{index1}}\ {{/each}}\ \ \ @@ -847,7 +874,8 @@ function _make_mkws_team($, teamName) { \ {{#first location having="md-subject"}}\ {{#if md-subject}}\ - {{md-subject}}\ + {{#commaList md-subject}}\ + {{this}}{{/commaList}}\ {{/if}}\ {{/first}}\ \ @@ -886,54 +914,57 @@ function _make_mkws_team($, teamName) { * All the HTML stuff to render the search forms and * result pages. */ + // ### This and other multi-word identifiers should be camelCase function mkws_html_all() { mkws_set_lang(); if (mkws_config.show_lang) mkws_html_lang(); - // For some reason, doing this programmatically results in - // document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML. debug("HTML search form"); - $("#mkwsSearch").html('\ -
\ - \ - \ + mkws.handle_node_with_team(findnode('.mkwsSearch'), function(tname) { + this.html('\ +\ + \ + \
'); + }); debug("HTML records"); - // If the application has an #mkwsResults, populate it in the - // usual way. If not, assume that it's a smarter application that - // defines its own subcomponents: - // #mkwsTermlists - // #mkwsRanking - // #mkwsPager - // #mkwsNavi - // #mkwsRecords - if ($("#mkwsResults").length) { - $("#mkwsResults").html('\ + // 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 + // following: + // .mkwsTermlists + // .mkwsRanking + // .mkwsPager + // .mkwsNavi + // .mkwsRecords + if (findnode(".mkwsResults").length) { + findnode(".mkwsResults").html('\ \ \ - \ - \ \ \ \ \
\ -
\ + 		\ +
\ 		\ -
\ -
\ -
\ -
\ + 		\ +
\ +
\ +
\ +
\
\ -
\ +
\
'); } - if ($("#mkwsRanking").length) { + var node = findnode(".mkwsRanking"); + if (node.length) { var ranking_data = ''; - ranking_data += '
'; + ranking_data += ''; if (mkws_config.show_sort) { ranking_data += M('Sort by') + ' ' + mkws_html_sort() + ' '; } @@ -942,69 +973,42 @@ function _make_mkws_team($, teamName) { } ranking_data += '
'; - $("#mkwsRanking").html(ranking_data); + node.html(ranking_data); } mkws_html_switch(); - if (mkws_config.use_service_proxy) { - mkws_service_proxy_auth(mkws_config.service_proxy_auth, - mkws_config.service_proxy_auth_domain, - mkws_config.pazpar2_url); - } else { - // raw pp2 - run_auto_searches(); - } - + // ### Should not be in the team code, since window size is global if (mkws_config.responsive_design_width) { // Responsive web design - change layout on the fly based on // current screen width. Required for mobile devices. - $(window).resize( function(e) { mkws_resize_page() }); + $(window).resize(function(e) { mkws.resize_page() }); // initial check after page load - $(document).ready(function() { mkws_resize_page() }); + $(document).ready(function() { mkws.resize_page() }); } - domReady(); + var node; + node = findnode('.mkwsSearchForm'); + if (node.length) + node.submit(onFormSubmitEventHandler); + node = findnode('.mkwsSort'); + if (node.length) + node.change(onSelectDdChange); + node = findnode('.mkwsPerpage'); + if (node.length) + node.change(onSelectDdChange); // on first page, hide the termlist - $(document).ready(function() { $("#mkwsTermlists").hide(); } ); - var motd = document.getElementById("mkwsMOTD"); - var container = document.getElementById("mkwsMOTDContainer"); - if (motd && container) { + $(document).ready(function() { findnode(".mkwsTermlists").hide(); }); + var motd = findnode(".mkwsMOTD"); + var container = findnode(".mkwsMOTDContainer"); + if (motd.length && container.length) { // Move the MOTD from the provided element down into the container - motd.parentNode.removeChild(motd); - container.appendChild(motd); + motd.appendTo(container); } } - function run_auto_searches() { - debug("running auto searches"); - - $('[id^="mkwsRecords"]').each(function () { - var node = $(this); - var query = node.attr('autosearch'); - - if (query) { - var windowid = undefined; - var id = node.attr('id'); - if (id.match(/^mkwsRecords_/, '')) { - windowid = id.replace(/^mkwsRecords_/, ''); - } - - var sort = node.attr('sort'); - var targets = node.attr('targets'); - var s = "running auto search: '" + query + "'"; - if (windowid) s += " [windowid '" + windowid + "']"; - if (sort) s += " sorted by '" + sort + "'"; - if (targets) s += " in targets '" + targets + "'"; - debug(s); - newSearch(query, sort, targets, windowid); - } - }); - } - - // implement $.parseQuerystring() for parsing URL parameters function parseQuerystring() { var nvpair = {}; @@ -1017,6 +1021,7 @@ function _make_mkws_team($, teamName) { return nvpair; } + function mkws_set_lang() { var lang = parseQuerystring().lang || mkws_config.lang; if (!lang || !mkws.locale_lang[lang]) { @@ -1029,24 +1034,28 @@ function _make_mkws_team($, teamName) { return mkws_config.lang; } + function mkws_html_switch() { - debug("HTML switch"); + debug("HTML switch for team " + m_teamName); - $("#mkwsSwitch").append($('' + M('Records') + '')); - $("#mkwsSwitch").append($("", { text: " | " })); - $("#mkwsSwitch").append($('' + M('Targets') + '')); + var node = findnode(".mkwsSwitch"); + node.append($('' + M('Records') + '')); + node.append($("", { text: " | " })); + node.append($('' + M('Targets') + '')); debug("HTML targets"); - $("#mkwsTargets").html('\ -
\ + var node = findnode(".mkwsTargets"); + node.html('\ +
\ No information available yet.\
'); - $("#mkwsTargets").css("display", "none"); + node.css("display", "none"); } + function mkws_html_sort() { debug("HTML sort, m_sort = '" + m_sort + "'"); - var sort_html = ''; for(var i = 0; i < mkws_config.sort_options.length; i++) { var opt = mkws_config.sort_options[i]; @@ -1064,15 +1073,16 @@ function _make_mkws_team($, teamName) { return sort_html; } + function mkws_html_perpage() { - debug("HTML perpage"); - var perpage_html = ''; for(var i = 0; i < mkws_config.perpage_options.length; i++) { var key = mkws_config.perpage_options[i]; perpage_html += '