X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=3ab07c76ff2dd66c9e42c70de49e6a93b569e6bb;hb=bc8d1d0c893f1a8f9f230df1e3f498b6c806927d;hp=828b049a19f000b4160cb54c215644a4b0d4dad3;hpb=2b35053e8c2dd524b28e37f2057814dffd81af91;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index 828b049..3ab07c7 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -249,7 +249,7 @@ function team($, teamName) { that.resetPage = resetPage; - function newSearch(query, sortOrder, perpage, targets) { + function newSearch(query, sortOrder, perpage, limit, targets, torusquery) { log("newSearch: " + query); if (m_config.use_service_proxy && !mkws.authenticated) { @@ -258,19 +258,19 @@ function team($, teamName) { } m_filters = [] - triggerSearch(query, sortOrder, perpage, targets); + triggerSearch(query, sortOrder, 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, 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) { @@ -308,6 +308,11 @@ function team($, teamName) { if (pp2limit) { params.limit = pp2limit; } + 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));