X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=194a59503ae04cf8e9f63a8ee30cefd037bb600a;hp=8b8ff076818dd35e556f67fe47476553d8b85f8c;hb=9102c6dd9e9aa1c442bbfe5bf1baa6a3da7ffce8;hpb=4cf1d83bcbec21e0309f2b05086c1512f0c9ad3c diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 8b8ff07..e047215 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -1,4 +1,7 @@ -/*! 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 @@ -10,7 +13,6 @@ Handlebars.registerHelper('json', function(obj) { Handlebars.registerHelper('translate', function(s) { - debug("translating '" + s + "'"); return mkws.M(s); }); @@ -63,27 +65,27 @@ Handlebars.registerHelper('commaList', function(items, options) { }); +Handlebars.registerHelper('index1', function(obj) { + return obj.data.index + 1; +}); -// Some functions are visible to be called from outside code, namely -// generated HTML: mkws.switchView(), showDetails(), limitTarget(), -// limitQuery(), delimitTarget(), delimitQuery(), pagerPrev(), -// pagerNext(), showPage(). Also mkws.M() is made available for the -// Handlebars helper 'translate' -// Set up global mkws object. Contains a hash of session objects, -// indexed by windowid. +// Set up global mkws object. Contains truly global state such as SP +// authentication, and a hash of team objects, indexed by team-name. +// var mkws = { authenticated: false, - init: false, - debug_function: undefined, // will be set during initialisation - debug_level: undefined, // will be initialised from mkws_config - sessions: {}, + 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", @@ -97,8 +99,10 @@ var mkws = { "found": "gefunden", "Title": "Titel", "Author": "Autor", + "author": "autor", "Date": "Datum", "Subject": "Schlagwort", + "subject": "schlagwort", "Location": "Ort", "Records": "Datensätze", "Targets": "Datenbanken", @@ -110,6 +114,7 @@ var mkws = { "Authors": "Forfattere", "Subjects": "Emner", "Sources": "Kilder", + "source": "kilder", "Termlists": "Termlists", "Next": "Næste", "Prev": "Forrige", @@ -123,8 +128,10 @@ var mkws = { "found": "fandt", "Title": "Title", "Author": "Forfatter", + "author": "forfatter", "Date": "Dato", "Subject": "Emneord", + "subject": "emneord", "Location": "Lokation", "Records": "Poster", "Targets": "Baser", @@ -141,260 +148,249 @@ if (mkws_config == null || typeof mkws_config != 'object') { } -// wrapper for jQuery lib -function _make_mkws_team($, teamName) { - var m_sort = 'relevance'; - var m_filters = []; - var m_curPage = 1; - var m_recPerPage = 20; - var m_totalRec = 0; - var m_curDetRecId = ''; - var m_curDetRecData = null; - var m_submitted = false; - var m_SourceMax = 16; - var m_SubjectMax = 10; - var m_AuthorMax = 10; - var m_query; // initially undefined - var m_debug_time = { - // Timestamps for logging - "start": $.now(), - "last": $.now() +// Factory function for widget objects. +function widget($, team, type, node) { + var that = { + team: team, + type: type, + node: node }; + var M = mkws.M; - // call this function only once - if (mkws.init) { - alert("_make_mkws_team() called twice: how did that happen?!"); - return; + if (type === 'Targets') { + promoteTargets(); + } else if (type === 'Stat') { + promoteStat(); + } else { + // ### Handle other types here } - // if (console && console.log) // disabled, will fail in IE8 - // console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")"); + mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node); + return that; - // Needs to be defined inside _make_mkws_team() so it can see m_debug_time - mkws.debug_function = function (string) { - if (!mkws.debug_level) - return; + // 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. - if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */ - return; - } + function promoteTargets() { + team.queue("targets").subscribe(function(data) { + if (node.length === 0) alert("huh?!"); - 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 table ='' + + '' + + '' + + '' + + '' + + '' + + ''; - // 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 + ' <<<'); - } - console.log(timestamp + string); + for (var i = 0; i < data.length; i++) { + table += ""; + } + + table += '
' + M('Target ID') + '' + M('Hits') + '' + M('Diags') + '' + M('Records') + '' + M('State') + '
" + data[i].id + + "" + data[i].hits + + "" + data[i].diagnostic + + "" + data[i].records + + "" + data[i].state + "
'; + var subnode = $(node).children('.mkwsBytarget'); + subnode.html(table); + }); } - var debug = mkws.debug_function; // local alias - debug("start running MKWS"); - { - - /* 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" - }; + function promoteStat() { + team.queue("stat").subscribe(function(data) { + if (node.length === 0) alert("huh?!"); - /* 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; - } + $(node).html('' + M('Status info') + '' + + ' -- ' + + '' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '' + + ' -- ' + + '' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + ''); + }); + } +} - // 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 = {}; - } - /* 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]); - } - } +// 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; + that.name = function() { return m_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 = {}; - m_sort = mkws_config.sort_default; - debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to m_sort"); + 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; - if (mkws_config.query_width < 5 || mkws_config.query_width > 150) { - debug("Reset query width: " + mkws_config.query_width); - mkws_config.query_width = 50; + mkws.debug(m_teamName + ": " + timestamp + s); } - 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 + "'"); - } - } - } + debug("start running MKWS"); - // protocol independend 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); - } + m_sort = mkws_config.sort_default; + m_perpage = mkws_config.perpage_default; 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 } ); - - if (!isNaN(parseInt(mkws_config.perpage_default))) { - m_recPerPage = parseInt(mkws_config.perpage_default); - } + m_paz = new pz2({ "windowid": teamName, + "pazpar2path": mkws_config.pazpar2_url, + "usesessions" : mkws_config.use_service_proxy ? false : true, + "oninit": onInit, + "onbytarget": onBytarget, + "onstat": onStat, + "onterm": (mkws_config.facets.length ? onTerm : undefined), + "onshow": onShow, + "onrecord": onRecord, + "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way + "termlist": mkws_config.facets.join(',') + }); // // pz2.js event handlers: // - function my_oninit() { + function onInit() { + debug("init"); m_paz.stat(); m_paz.bytarget(); } - function my_onshow(data) { - m_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); - } - - // navi - var results = document.getElementById("mkwsRecords"); - - var html = []; - for (var i = 0; i < data.hits.length; i++) { - var hit = data.hits[i]; - html.push('
', - renderSummary(hit), - '
'); - if (hit.recid == m_curDetRecId) { - html.push(renderDetails(m_curDetRecData)); - } - } - replaceHtml(results, html.join('')); + function onBytarget(data) { + debug("target"); + queue("targets").publish(data); } - function renderSummary(hit) - { - var template = loadTemplate("Summary"); - hit._id = "mkwsRec_" + hit.recid; - hit._onclick = "mkws.showDetails(this.id);return false;" - return template(hit); + function onStat(data) { + debug("stat"); + queue("stat").publish(data); } - function my_onstat(data) { - var stat = document.getElementById("mkwsStat"); - if (stat == null) - return; - - stat.innerHTML = '' + M('Status info') + '' + - ' -- ' + - '' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '' + - ' -- ' + - '' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + ''; - } - + function onTerm(data) { + debug("term"); + var node = findnode(".mkwsTermlists"); + if (node.length == 0) return; - function my_onterm(data) { - // no facets + // no facets: this should never happen if (!mkws_config.facets || mkws_config.facets.length == 0) { - $("#mkwsTermlists").hide(); + alert("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, m_SourceMax, null); - } else if (facets[i] == "subjects") { - add_single_facet(acc, "Subjects", data.subject, m_SubjectMax, "subject"); - } else if (facets[i] == "authors") { - add_single_facet(acc, "Authors", data.author, m_AuthorMax, "author"); + if (facets[i] == "xtargets") { + addSingleFacet(acc, "Sources", data.xtargets, 16, null); + } else if (facets[i] == "subject") { + addSingleFacet(acc, "Subjects", data.subject, 10, "subject"); + } else if (facets[i] == "author") { + addSingleFacet(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 onShow(data, teamName) { + debug("show"); + m_totalRec = data.merged; + + var pager = findnode(".mkwsPager"); + if (pager.length) { + pager.html(drawPager(data)) + } + + 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('
', + renderSummary(hit), + '
'); + if (hit.recid == m_curDetRecId) { + if (m_curDetRecData) + html.push(renderDetails(m_curDetRecData)); + } + } + results.html(html.join('')); + } + + + function onRecord(data, args, teamName) { + debug("record"); + // FIXME: record is async!! + clearTimeout(m_paz.recordTimer); + // in case on_show was faster to redraw element + 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).append(html); } - function add_single_facet(acc, caption, data, max, pzIndex) { - acc.push('
'); + function addSingleFacet(acc, caption, data, max, pzIndex) { + 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 + ''); @@ -404,73 +400,85 @@ function _make_mkws_team($, teamName) { } - function my_onrecord(data) { - // FIXME: record is async!! - clearTimeout(m_paz.recordTimer); - // in case on_show was faster to redraw element - var detRecordDiv = document.getElementById('mkwsDet_'+data.recid); - if (detRecordDiv) return; - m_curDetRecData = data; - var recordDiv = document.getElementById('mkwsRecdiv_'+m_curDetRecData.recid); - var html = renderDetails(m_curDetRecData); - recordDiv.innerHTML += html; + function targetFiltered(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_onbytarget(data) { - var targetDiv = document.getElementById("mkwsBytarget"); - if (!targetDiv) { - // No mkwsTargets div. - return; - } + function drawPager (data) + { + var s = '
' + M('Displaying') + ': ' + + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) + + ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': ' + + data.total + ')
'; - var table ='' + - '' + - '' + - '' + - '' + - '' + - ''; - - for (var i = 0; i < data.length; i++ ) { - table += ""; - } + //client indexes pages from 1 but pz2 from 0 + var onsides = 6; + var pages = Math.ceil(m_totalRec / m_perpage); - table += '
' + M('Target ID') + '' + M('Hits') + '' + M('Diags') + '' + M('Records') + '' + M('State') + '
" + data[i].id + - "" + data[i].hits + - "" + data[i].diagnostic + - "" + data[i].records + - "" + data[i].state + "
'; - targetDiv.innerHTML = table; - } + 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 (m_curPage > 1) + prev = '' + +'<< ' + M('Prev') + ' | '; - // 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; + var middle = ''; + for(var i = firstClkbl; i <= lastClkbl; i++) { + var numLabel = i; + if(i == m_curPage) + numLabel = '' + i + ''; + + middle += ' ' + + numLabel + ' '; } + + var next = ' | ' + M('Next') + ' >>'; + if (pages - m_curPage > 0) + next = ' | ' + + M('Next') + ' >>'; + + var predots = ''; + if (firstClkbl > 1) + predots = '...'; + + var postdots = ''; + if (lastClkbl < pages) + postdots = '...'; + + s += '
' + + prev + predots + middle + postdots + next + '
'; + + return s; } + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + + // when search button pressed function onFormSubmitEventHandler() { - newSearch(document.mkwsSearchForm.mkwsQuery.value); + var val = findnode('.mkwsQuery').val(); + newSearch(val); return false; } - function newSearch(query, sort, targets, windowid) + function newSearch(query, sort, targets) { debug("newSearch: " + query); @@ -480,11 +488,11 @@ 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 - triggerSearch(query, sort, targets, windowid); - mkws.switchView('records'); // In case it's configured to start off as hidden + redrawNavi(); + resetPage(); + loadSelect(); + triggerSearch(query, sort, targets); + switchView('records'); // In case it's configured to start off as hidden m_submitted = true; } @@ -494,11 +502,36 @@ function _make_mkws_team($, teamName) { if (!m_submitted) return false; resetPage(); loadSelect(); - m_paz.show(0, m_recPerPage, m_sort); + m_paz.show(0, m_perpage, m_sort); return false; } + function redrawNavi () + { + var navi = findnode('.mkwsNavi'); + if (!navi) return; + + var text = ""; + for (var i in m_filters) { + if (text) { + text += " | "; + } + var filter = m_filters[i]; + if (filter.id) { + text += M('source') + ': ' + filter.name + ''; + } else { + text += M(filter.field) + ': ' + filter.value + ''; + } + } + + navi.html(text); + } + + function resetPage() { m_curPage = 1; @@ -506,7 +539,22 @@ function _make_mkws_team($, teamName) { } - function triggerSearch (query, sort, targets, windowid) + 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(); + } + node = findnode('.mkwsPerpage'); + if (node.length && node.val() != m_perpage) { + debug("changing m_perpage from " + m_perpage + " to " + node.val()); + m_perpage = node.val(); + } + } + + + function triggerSearch (query, sort, targets) { var pp2filter = ""; var pp2limit = ""; @@ -519,7 +567,6 @@ function _make_mkws_team($, teamName) { m_sort = sort; } if (targets) { - // ### should support multiple |-separated targets m_filters.push({ id: targets, name: targets }); } @@ -545,32 +592,21 @@ function _make_mkws_team($, teamName) { if (pp2limit) { params.limit = pp2limit; } - if (windowid) { - params.windowid = windowid; - } - debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params)); - - m_paz.search(m_query, m_recPerPage, m_sort, pp2filter, undefined, params); - } + debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params)); - function loadSelect () - { - if (document.mkwsSelect) { - if (document.mkwsSelect.mkwsSort) - m_sort = document.mkwsSelect.mkwsSort.value; - if (document.mkwsSelect.mkwsPerpage) - m_recPerPage = document.mkwsSelect.mkwsPerpage.value; - } + // 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); } - // 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 }); - redraw_navi(); + debug("limitTarget(id=" + id + ", name=" + name + ")"); + m_filters.push({ id: id, name: name }); + redrawNavi(); resetPage(); loadSelect(); triggerSearch(); @@ -578,12 +614,12 @@ function _make_mkws_team($, teamName) { } - // 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 }); - redraw_navi(); + debug("limitQuery(field=" + field + ", value=" + value + ")"); + m_filters.push({ field: field, value: value }); + redrawNavi(); resetPage(); loadSelect(); triggerSearch(); @@ -591,15 +627,13 @@ function _make_mkws_team($, teamName) { } - 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)); @@ -608,7 +642,7 @@ function _make_mkws_team($, teamName) { } m_filters = newFilters; - redraw_navi(); + redrawNavi(); resetPage(); loadSelect(); triggerSearch(); @@ -616,22 +650,24 @@ 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); } } m_filters = newFilters; - redraw_navi(); + redrawNavi(); resetPage(); loadSelect(); triggerSearch(); @@ -639,128 +675,54 @@ function _make_mkws_team($, teamName) { } - function redraw_navi () + that.showPage = function (pageNum) { - var navi = document.getElementById('mkwsNavi'); - if (!navi) return; - - var text = ""; - for (var i in m_filters) { - if (text) { - text += " | "; - } - var filter = m_filters[i]; - if (filter.id) { - text += 'Source: ' + filter.name + ''; - } else { - text += filter.field + ': ' + filter.value + ''; - } - } - - navi.innerHTML = text; - } - - - function drawPager (pagerDiv) - { - //client indexes pages from 1 but pz2 from 0 - var onsides = 6; - var pages = Math.ceil(m_totalRec / m_recPerPage); - - 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 (m_curPage > 1) - prev = '' - +'<< ' + M('Prev') + ' | '; - - var middle = ''; - for(var i = firstClkbl; i <= lastClkbl; i++) { - var numLabel = i; - if(i == m_curPage) - numLabel = '' + i + ''; - - middle += ' ' - + numLabel + ' '; - } - - var next = ' | ' + M('Next') + ' >>'; - if (pages - m_curPage > 0) - next = ' | ' - + M('Next') + ' >>'; - - var predots = ''; - if (firstClkbl > 1) - predots = '...'; - - var postdots = ''; - if (lastClkbl < pages) - postdots = '...'; - - pagerDiv.innerHTML += '
' - + prev + predots + middle + postdots + next + '
'; - } - - - mkws.showPage = function (pageNum) - { - m_curPage = pageNum; - m_paz.showPage( m_curPage - 1 ); - } + m_curPage = pageNum; + m_paz.showPage(m_curPage - 1); + } // simple paging functions - mkws.pagerNext = function () { - if ( m_totalRec - m_recPerPage*m_curPage > 0) { + that.pagerNext = function () { + if (m_totalRec - m_perpage*m_curPage > 0) { m_paz.showNext(); m_curPage++; } } - mkws.pagerPrev = function () { - if ( m_paz.showPrev() != false ) + that.pagerPrev = function () { + if (m_paz.showPrev() != false) m_curPage--; } // switching view between targets and records - 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'); + function switchView(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 + "'"); @@ -768,14 +730,17 @@ function _make_mkws_team($, teamName) { } + that.switchView = switchView; + + // detailed record drawing - mkws.showDetails = function (prefixRecId) { + that.showDetails = function (prefixRecId) { var recId = prefixRecId.replace('mkwsRec_', ''); 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); @@ -787,270 +752,102 @@ function _make_mkws_team($, teamName) { 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 + '
'; - } - - - function loadTemplate(name) - { - var template = mkws['template' + name]; - - if (template === undefined) { - var source = $("#mkwsTemplate" + name).html(); - if (!source) { - source = defaultTemplate(name); - } - - template = Handlebars.compile(source); - debug("compiled template '" + name + "'"); - mkws['template' + name] = template; - } - - return template; - } - - - function defaultTemplate(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 "URL"}}\ - {{#each md-electronic-url}}\ - {{this}}
\ - {{/each}}\ -
{{translate "Subject"}}\ - {{#first location having="md-subject"}}\ - {{#if md-subject}}\ - {{md-subject}}\ - {{/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; - } - - /* * All the HTML stuff to render the search forms and * result pages. */ - function mkws_html_all() { - mkws_set_lang(); + function mkwsHtmlAll() { + mkwsSetLang(); if (mkws_config.show_lang) - mkws_html_lang(); + mkwsHtmlLang(); - // For some reason, doing this programmatically results in - // document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML. debug("HTML search form"); - $("#mkwsSearch").html('\ -
\ - \ - \ + mkws.handleNodeWithTeam(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() + ' '; + ranking_data += M('Sort by') + ' ' + mkwsHtmlSort() + ' '; } if (mkws_config.show_perpage) { - ranking_data += M('and show') + ' ' + mkws_html_perpage() + ' ' + M('per page') + '.'; + ranking_data += M('and show') + ' ' + mkwsHtmlPerpage() + ' ' + M('per page') + '.'; } ranking_data += '
'; - $("#mkwsRanking").html(ranking_data); + node.html(ranking_data); } - mkws_html_switch(); + mkwsHtmlSwitch(); - 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(); - } - - 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() }); - // initial check after page load - $(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 = {}; - var qs = window.location.search.replace('?', ''); - var pairs = qs.split('&'); - $.each(pairs, function(i, v){ - var pair = v.split('='); - nvpair[pair[0]] = pair[1]; - }); - return nvpair; - } - - - function mkws_set_lang() { - var lang = parseQuerystring().lang || mkws_config.lang; + function mkwsSetLang() { + var lang = mkws.getParameterByName("lang") || mkws_config.lang; if (!lang || !mkws.locale_lang[lang]) { mkws_config.lang = "" } else { @@ -1062,25 +859,52 @@ function _make_mkws_team($, teamName) { } - function mkws_html_switch() { - debug("HTML switch"); + /* create locale language menu */ + function mkwsHtmlLang() { + var lang_default = "en"; + var lang = mkws_config.lang || lang_default; + var list = []; + + /* display a list of configured languages, or all */ + var lang_options = mkws_config.lang_options || []; + var toBeIncluded = {}; + for (var i = 0; i < lang_options.length; i++) { + toBeIncluded[lang_options[i]] = true; + } + + for (var k in mkws.locale_lang) { + if (toBeIncluded[k] || lang_options.length == 0) + list.push(k); + } + + // add english link + if (lang_options.length == 0 || toBeIncluded[lang_default]) + list.push(lang_default); - $("#mkwsSwitch").append($('' + M('Records') + '')); - $("#mkwsSwitch").append($("", { text: " | " })); - $("#mkwsSwitch").append($('' + M('Targets') + '')); + debug("Language menu for: " + list.join(", ")); - debug("HTML targets"); - $("#mkwsTargets").html('\ -
\ - No information available yet.\ -
'); - $("#mkwsTargets").css("display", "none"); + /* the HTML part */ + var data = ""; + for(var i = 0; i < list.length; i++) { + var l = list[i]; + + if (data) + data += ' | '; + + if (lang == l) { + data += ' ' + l + ' '; + } else { + data += ' ' + l + ' ' + } + } + + findnode(".mkwsLang").html(data); } - function mkws_html_sort() { + function mkwsHtmlSort() { 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]; @@ -1099,15 +923,15 @@ function _make_mkws_team($, teamName) { } - 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 += '