X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=716b920f9e345cad380d8062bdf8aa763e1cbf41;hb=dbd20b82821d1f50ff1d7389b1b1f551456a22c5;hp=8a78520c3c915aac7731392a75cdbfbc86a8cbe8;hpb=f9be8d513ce69935b92cd791c3a62fb365969bce;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index 8a78520..716b920 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -127,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); } @@ -170,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(); @@ -179,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(); @@ -188,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(); @@ -197,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(); @@ -221,8 +218,7 @@ function team($, teamName) { } - that.showPage = function(pageNum) - { + that.showPage = function(pageNum) { m_currentPage = pageNum; m_paz.showPage(m_currentPage - 1); }; @@ -247,16 +243,14 @@ function team($, teamName) { }; - function resetPage() - { + function resetPage() { m_currentPage = 1; m_totalRecordCount = 0; } that.resetPage = resetPage; - function newSearch(query, sortOrder, perpage, targets) - { + function newSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) { log("newSearch: " + query); if (m_config.use_service_proxy && !mkws.authenticated) { @@ -265,20 +259,19 @@ function team($, teamName) { } m_filters = [] - triggerSearch(query, sortOrder, perpage, 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, perpage, 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) { @@ -316,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)); @@ -601,8 +602,7 @@ function team($, teamName) { } - function renderDetails(data, marker) - { + function renderDetails(data, marker) { var template = loadTemplate("Record"); var details = template(data); return '
\ @@ -710,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!";