X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=ee18f1ba94cf134117cc803f22090720e54a795f;hb=9d52a0bf9dcc57cb339d42ca1e4b637894d507e5;hp=5b111e56a6797ad245a6b7c09a1fb152c5db221e;hpb=d6d313be78c667fe9fab912c141a7bc1beae7578;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index 5b111e5..ee18f1b 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -27,7 +27,7 @@ function team($, teamName) { }; var m_paz; // will be initialised below var m_template = {}; - var m_config = Object.create(mkws.config); + var m_config = mkws.objectInheritingFrom(mkws.config); that.toString = function() { return '[Team ' + teamName + ']'; }; @@ -102,11 +102,6 @@ function team($, teamName) { "termlist": m_config.facets.join(',') }); - queue("ready").subscribe(function() { - log("in 'ready' consumer"); - that.runAutoSearch(); - }); - // pz2.js event handlers: function onInit() { log("init"); @@ -132,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); } @@ -175,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(); @@ -184,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(); @@ -193,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(); @@ -202,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(); @@ -226,8 +218,7 @@ function team($, teamName) { } - that.showPage = function(pageNum) - { + that.showPage = function(pageNum) { m_currentPage = pageNum; m_paz.showPage(m_currentPage - 1); }; @@ -252,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) { @@ -270,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) { @@ -291,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 }); } @@ -317,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)); @@ -367,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) { @@ -431,6 +427,15 @@ function team($, teamName) { \ '); + var acc = []; + var facets = m_config.facets; + acc.push('