X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=18ac664b852808ff5600c782b9c82f5d46573da1;hb=c52fd3b80ba09d9be09ec45a4dc17fe4bd96064b;hp=9ffe3e1e448adab75aedf866cf3309a7796ef426;hpb=859e28a7c5879af9c23b75e219ac7ce0ed317eb7;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 9ffe3e1..18ac664 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -417,7 +417,7 @@ function onFormSubmitEventHandler()
     return false;
 }
 
-function newSearch(query)
+function newSearch(query, sort, targets)
 {
     if (!mkws.authenticated) {
 	alert("searching before authentication");
@@ -428,7 +428,7 @@ function newSearch(query)
     redraw_navi();
     resetPage();
     loadSelect();
-    triggerSearch(query);
+    triggerSearch(query, sort, targets);
     mkws.switchView('records'); // In case it's configured to start off as hidden
     submitted = true;
 }
@@ -448,22 +448,31 @@ function resetPage()
     totalRec = 0;
 }
 
-function triggerSearch (query)
+function triggerSearch (query, sort, targets)
 {
     var pp2filter = "";
     var pp2limit = "";
 
-    // Re-use previous query if a new one is not specified
+    // Re-use previous query/sort if new ones are not specified
     if (query) {
 	mkws.query = query;
     }
+    if (sort) {
+	mkws.sort = sort;
+    }
+    if (targets) {
+	// ### should support multiple |-separated targets
+	mkws.filters.push({ id: targets, name: targets });
+    }
 
     for (var i in mkws.filters) {
 	var filter = mkws.filters[i];
 	if (filter.id) {
 	    if (pp2filter)
-		pp2filter += ",";
-	    pp2filter += 'pz:id=' + filter.id;
+		pp2filter += "|";
+	    if (filter.id.indexOf('pz:id=') != 0)
+		filter.id = 'pz:id=' + filter.id;
+	    pp2filter += filter.id;
 	} else {
 	    if (pp2limit)
 		pp2limit += ",";
@@ -920,9 +929,12 @@ function run_auto_searches() {
     if (node.attr('autosearch')) {
 	var query = node.attr('autosearch');
 	var sort = node.attr('sort');
-	debug("running auto search: '" + query + "' sorted by '" + sort + "'");
-	// ### currently ignoring sort
-	newSearch(query);
+	var targets = node.attr('targets');
+	var s = "running auto search: '" + query + "'";
+	if (sort) s += " sorted by '" + sort + "'";
+	if (targets) s += " in targets '" + targets + "'";
+	debug(s);
+	newSearch(query, sort, targets);
     }
 }