X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=ef156877506af8d158a5712f1e4f1eb2ba0a085d;hb=f18d4ea782b37d8a56636f759ab0982bc6a5830f;hp=f34d2a9d11f3513e7a35ae4b2d191fcd88ec3cd8;hpb=3cd7917e3ada63d397a128a681685c1b7cab04c1;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index f34d2a9..ef15687 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -427,7 +427,7 @@ function onFormSubmitEventHandler()
     return false;
 }
 
-function newSearch(query, sort, targets)
+function newSearch(query, sort, targets, windowid)
 {
     debug("newSearch: " + query);
 
@@ -437,10 +437,10 @@ function newSearch(query, sort, targets)
     }
 
     mkws.filters = []
-    redraw_navi();
-    resetPage();
-    loadSelect();
-    triggerSearch(query, sort, targets);
+    redraw_navi(); // ### should use windowid
+    resetPage(); // ### the globals it resents should be indexed by windowid
+    loadSelect(); // ### should use windowid
+    triggerSearch(query, sort, targets, windowid);
     mkws.switchView('records'); // In case it's configured to start off as hidden
     submitted = true;
 }
@@ -460,7 +460,7 @@ function resetPage()
     totalRec = 0;
 }
 
-function triggerSearch (query, sort, targets)
+function triggerSearch (query, sort, targets, windowid)
 {
     var pp2filter = "";
     var pp2limit = "";
@@ -495,8 +495,16 @@ function triggerSearch (query, sort, targets)
 	}
     }
 
-    debug("triggerSearch(" + mkws.query + "): filters = " + $.toJSON(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit);
-    my_paz.search(mkws.query, recPerPage, mkws.sort, pp2filter, undefined, { limit: pp2limit });
+    var params = {};
+    if (pp2limit) {
+	params.limit = pp2limit;
+    }
+    if (windowid) {
+	params.windowid = windowid;
+    }
+    debug("triggerSearch(" + mkws.query + "): filters = " + $.toJSON(mkws.filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
+
+    my_paz.search(mkws.query, recPerPage, mkws.sort, pp2filter, undefined, params);
 }
 
 function loadSelect ()
@@ -945,19 +953,29 @@ function mkws_html_all() {
 
 
 function run_auto_searches() {
-    debug("run auto searches");
+    debug("running auto searches");
 
-    var node = $('#mkwsRecords');
-    if (node.attr('autosearch')) {
+    $('[id^="mkwsRecords"]').each(function () {
+	var node = $(this);
 	var query = node.attr('autosearch');
-	var sort = node.attr('sort');
-	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);
-    }
+
+	if (query) {
+	    var windowid = undefined;
+	    var id = node.attr('id');
+	    if (id.match(/^mkwsRecords_/, '')) {
+		windowid = id.replace(/^mkwsRecords_/, '');
+	    }
+
+	    var sort = node.attr('sort');
+	    var targets = node.attr('targets');
+	    var s = "running auto search: '" + query + "'";
+	    if (windowid) s += " [windowid '" + windowid + "']";
+	    if (sort) s += " sorted by '" + sort + "'";
+	    if (targets) s += " in targets '" + targets + "'";
+	    debug(s);
+	    newSearch(query, sort, targets, windowid);
+	}
+    });
 }