X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=716b920f9e345cad380d8062bdf8aa763e1cbf41;hb=8c4fbdc727427c3e2fe320aa7a6a0ecd72a72116;hp=c7e20bf29235c4d8b1e50fb998d9c611528f632f;hpb=c4848ba08bb08b8dcb6d191869d876c19f23ad6e;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index c7e20bf..716b920 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -47,15 +47,39 @@ function team($, teamName) { that.set_perpage = function(val) { m_perpage = val }; + // 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 = {}; + function queue(id) { + if (!queues[id]) { + var callbacks = $.Callbacks(); + queues[id] = { + publish: callbacks.fire, + subscribe: callbacks.add, + unsubscribe: callbacks.remove + }; + } + return queues[id]; + }; + that.queue = queue; + + function log(s) { var now = $.now(); var timestamp = (((now - m_logTime.start)/1000).toFixed(3) + " (+" + ((now - m_logTime.last)/1000).toFixed(3) + ") "); m_logTime.last = now; mkws.log(m_teamName + ": " + timestamp + s); + that.queue("log").publish(m_teamName, timestamp, s); } that.log = log; + log("start running MKWS"); m_sortOrder = m_config.sort_default; @@ -78,7 +102,6 @@ function team($, teamName) { "termlist": m_config.facets.join(',') }); - // pz2.js event handlers: function onInit() { log("init"); @@ -104,6 +127,7 @@ function team($, teamName) { function onShow(data, teamName) { log("show"); m_totalRecordCount = data.merged; + log("found " + m_totalRecordCount + " records"); queue("pager").publish(data); queue("records").publish(data); } @@ -147,8 +171,7 @@ function team($, teamName) { }; - that.limitTarget = function(id, name) - { + that.limitTarget = function(id, name) { log("limitTarget(id=" + id + ", name=" + name + ")"); m_filters.push({ id: id, name: name }); triggerSearch(); @@ -156,8 +179,7 @@ function team($, teamName) { }; - that.limitQuery = function(field, value) - { + that.limitQuery = function(field, value) { log("limitQuery(field=" + field + ", value=" + value + ")"); m_filters.push({ field: field, value: value }); triggerSearch(); @@ -165,8 +187,7 @@ function team($, teamName) { }; - that.delimitTarget = function(id) - { + that.delimitTarget = function(id) { log("delimitTarget(id=" + id + ")"); removeMatchingFilters(function(f) { return f.id }); triggerSearch(); @@ -174,8 +195,7 @@ function team($, teamName) { }; - that.delimitQuery = function(field, value) - { + that.delimitQuery = function(field, value) { log("delimitQuery(field=" + field + ", value=" + value + ")"); removeMatchingFilters(function(f) { return f.field && field == f.field && value == f.value }); triggerSearch(); @@ -198,8 +218,7 @@ function team($, teamName) { } - that.showPage = function(pageNum) - { + that.showPage = function(pageNum) { m_currentPage = pageNum; m_paz.showPage(m_currentPage - 1); }; @@ -224,16 +243,14 @@ function team($, teamName) { }; - function resetPage() - { + function resetPage() { m_currentPage = 1; m_totalRecordCount = 0; } that.resetPage = resetPage; - function newSearch(query, sortOrder, targets) - { + function newSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) { log("newSearch: " + query); if (m_config.use_service_proxy && !mkws.authenticated) { @@ -242,19 +259,19 @@ function team($, teamName) { } m_filters = [] - triggerSearch(query, sortOrder, targets); + triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery); switchView('records'); // In case it's configured to start off as hidden m_submitted = true; } + that.newSearch = newSearch; - function triggerSearch(query, sortOrder, targets) - { + function triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) { resetPage(); queue("navi").publish(); var pp2filter = ""; - var pp2limit = ""; + var pp2limit = limit || ""; // Continue to use previous query/sort-order unless new ones are specified if (query) { @@ -263,6 +280,9 @@ function team($, teamName) { if (sortOrder) { m_sortOrder = sortOrder; } + if (perpage) { + m_perpage = perpage; + } if (targets) { m_filters.push({ id: targets, name: targets }); } @@ -289,6 +309,14 @@ function team($, teamName) { if (pp2limit) { params.limit = pp2limit; } + if (maxrecs) { + params.maxrecs = maxrecs; + } + if (torusquery) { + if (!mkws.config.use_service_proxy) + alert("can't narrow search by torusquery when Service Proxy is not in use"); + params.torusquery = torusquery; + } log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", " + "pp2filter = " + pp2filter + ", params = " + $.toJSON(params)); @@ -339,11 +367,7 @@ function team($, teamName) { m_currentRecordId = recId; // remove current detailed view if any - // ##### restrict to current team - var detRecordDiv = document.getElementById(recordDetailsId(oldRecordId)); - // lovin DOM! - if (detRecordDiv) - detRecordDiv.parentNode.removeChild(detRecordDiv); + findnode('#' + recordDetailsId(oldRecordId)).remove(); // if the same clicked, just hide if (recId == oldRecordId) { @@ -432,7 +456,7 @@ function team($, teamName) { function mkwsSetLang() { - var lang = getParameterByName("lang") || m_config.lang; + var lang = mkws.getParameterByName("lang") || m_config.lang; if (!lang || !mkws.locale_lang[lang]) { m_config.lang = "" } else { @@ -545,52 +569,6 @@ function team($, teamName) { } - that.runAutoSearch = function() { - var node = findnode('.mkwsRecords,.mkwsTermlists'); - var query = node.attr('autosearch'); - if (!query) - return; - - if (query.match(/^!param!/)) { - var param = query.replace(/^!param!/, ''); - query = getParameterByName(param); - log("obtained query '" + query + "' from param '" + param + "'"); - if (!query) { - alert("This page has a MasterKey widget that needs a query specified by the '" + param + "' parameter"); - } - } else if (query.match(/^!path!/)) { - var index = query.replace(/^!path!/, ''); - var path = window.location.pathname.split('/'); - query = path[path.length - index]; - log("obtained query '" + query + "' from path-component '" + index + "'"); - if (!query) { - alert("This page has a MasterKey widget that needs a query specified by the path-component " + index); - } - } - - log("node=" + node + ", class='" + node.className + "', query=" + query); - - var sortOrder = node.attr('sort'); - var targets = node.attr('targets'); - var s = "running auto search: '" + query + "'"; - if (sortOrder) s += " sorted by '" + sortOrder + "'"; - if (targets) s += " in targets '" + targets + "'"; - log(s); - - newSearch(query, sortOrder, targets); - }; - - - // This function is taken from a StackOverflow answer - // http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript/901144#901144 - function getParameterByName(name) { - name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]"); - var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"), - results = regex.exec(location.search); - return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - } - - // Translation function. At present, this is properly a // global-level function (hence the assignment to mkws.M) but we // want to make it per-team so different teams can operate in @@ -624,8 +602,7 @@ function team($, teamName) { } - function renderDetails(data, marker) - { + function renderDetails(data, marker) { var template = loadTemplate("Record"); var details = template(data); return '
\ @@ -733,6 +708,15 @@ function team($, teamName) { {{md-title-responsibility}}\ {{/if}}\ '; + } else if (name === "Image") { + return '\ + \ + {{#first md-thumburl}}\ + {{../md-title}}\ + {{/first}}\ +
\ + \ +'; } var s = "There is no default '" + name +"' template!"; @@ -741,27 +725,6 @@ function team($, teamName) { } - // 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 - }; - } - return queues[id]; - }; - that.queue = queue; - mkwsHtmlAll() return that;