X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=8c81a1a857518f444447b963978375174ccba213;hb=HEAD;hp=3d40f233801ba302e539aeccfbd6b814570a74d5;hpb=e15240ac672091b677a5df853ef39dbbbed95d35;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index 3d40f23..8c81a1a 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -288,7 +288,7 @@ mkws.makeTeam = function($, teamName) { that.resetPage = resetPage; - function newSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) { + function newSearch(widget, query, sortOrder, maxrecs, perpage, limit, targets, torusquery) { that.info("newSearch: " + query); if (config.use_service_proxy && !mkws.authenticated) { @@ -296,6 +296,26 @@ mkws.makeTeam = function($, teamName) { return; } + { + if (!sortOrder) sortOrder = widget.config.sort; + if (!maxrecs) maxrecs = widget.config.maxrecs; + if (!perpage) perpage = widget.config.perpage; + if (!limit) limit = widget.config.limit; + if (!targets) targets = widget.config.targets; + if (!torusquery) torusquery = widget.config.targetfilter; + var target = widget.config.target; + if (target) torusquery = 'udb=="' + target + '"'; + + var s = "running search: '" + query + "'"; + if (sortOrder) s += " sorted by '" + sortOrder + "'"; + if (maxrecs) s += " restricted to " + maxrecs + " records"; + if (perpage) s += " with " + perpage + " per page"; + if (limit) s += " limited by '" + limit + "'"; + if (targets) s += " in targets '" + targets + "'"; + if (torusquery) s += " constrained by torusquery '" + torusquery + "'"; + that.info(s); + } + m_filterSet.removeMatching(function(f) { return f.type !== 'category' }); triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery); switchView('records'); // In case it's configured to start off as hidden @@ -499,8 +519,7 @@ mkws.makeTeam = function($, teamName) { } } return undefined; - } - + }; return that; };