X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=67bedc6625857721b0c2b900f915f544799bee63;hb=37890f04937e3a8a55cea1b2d1a535ebed385cde;hp=b5c1b346cfb7a6b66fc58eb6c9d7b9d235fc5244;hpb=65bd06d8b82c551b6e29a248e4b13f9e4d6016cb;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index b5c1b34..67bedc6 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -5,6 +5,8 @@
 
 // Set up namespace and some state.
 var mkws = {
+    sort: 'relevance',
+    authenticated: false,
     filters: [],
 };
 
@@ -191,6 +193,9 @@ Handlebars.registerHelper('commaList', function(items, options) {
     }
 }
 
+mkws.sort = mkws_config.sort_default;
+debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to mkws.sort");
+
 if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
     debug("Reset query width: " + mkws_config.query_width);
     mkws_config.query_width = 50;
@@ -231,7 +236,6 @@ var recPerPage = 20;
 var totalRec = 0;
 var curDetRecId = '';
 var curDetRecData = null;
-var curSort = 'relevance';
 var submitted = false;
 var SourceMax = 16;
 var SubjectMax = 10;
@@ -260,7 +264,6 @@ function my_onshow(data) {
 
     // navi
     var results = document.getElementById("mkwsRecords");
-    debug("my_onshow(" + JSON.stringify(data) + ")");
 
     var html = [];
     for (var i = 0; i < data.hits.length; i++) {
@@ -414,13 +417,18 @@ function onFormSubmitEventHandler()
     return false;
 }
 
-function newSearch(query)
+function newSearch(query, sort, targets)
 {
+    if (!mkws.authenticated) {
+	alert("searching before authentication");
+	return;
+    }
+
     mkws.filters = []
     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;
 }
@@ -430,7 +438,7 @@ function onSelectDdChange()
     if (!submitted) return false;
     resetPage();
     loadSelect();
-    my_paz.show(0, recPerPage, curSort);
+    my_paz.show(0, recPerPage, mkws.sort);
     return false;
 }
 
@@ -440,15 +448,22 @@ 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];
@@ -464,14 +479,14 @@ function triggerSearch (query)
     }
 
     debug("triggerSearch(" + mkws.query + "): filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit);
-    my_paz.search(mkws.query, recPerPage, curSort, pp2filter, undefined, { limit: pp2limit });
+    my_paz.search(mkws.query, recPerPage, mkws.sort, pp2filter, undefined, { limit: pp2limit });
 }
 
 function loadSelect ()
 {
     if (document.mkwsSelect) {
 	if (document.mkwsSelect.mkwsSort)
-	    curSort = document.mkwsSelect.mkwsSort.value;
+	    mkws.sort = document.mkwsSelect.mkwsSort.value;
 	if (document.mkwsSelect.mkwsPerpage)
 	    recPerPage = document.mkwsSelect.mkwsPerpage.value;
     }
@@ -910,11 +925,14 @@ function mkws_html_all() {
 function run_auto_searches() {
     var node = $('#mkwsRecords');
     if (node.attr('autosearch')) {
-	var query = node.attr('query');
+	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);
     }
 }
 
@@ -947,7 +965,7 @@ function mkws_html_switch() {
 }
 
 function mkws_html_sort() {
-    debug("HTML sort");
+    debug("HTML sort, mkws.sort = '" + mkws.sort + "'");
     var sort_html = '<select name="mkwsSort" id="mkwsSort">';
 
     for(var i = 0; i < mkws_config.sort_options.length; i++) {
@@ -956,7 +974,7 @@ function mkws_html_sort() {
 	var val = opt.length == 1 ? opt[0] : opt[1];
 
 	sort_html += '<option value="' + key + '"';
-	if (key == mkws_config.sort_default) {
+	if (mkws.sort == key || mkws.sort == val) {
 	    sort_html += ' selected="selected"';
 	}
 	sort_html += '>' + M(val) + '</option>';
@@ -1009,7 +1027,8 @@ function mkws_service_proxy_auth(auth_url, auth_domain) {
 	}
 
 	debug("Service proxy auth successfully done");
-	mkws.service_proxy_auth = true;
+	mkws.authenticated = true;
+	run_auto_searches();
     });
 }
 
@@ -1247,8 +1266,6 @@ $(document).ready(function() {
 	mkws_config.error = e.message;
 	// alert(e.message);
     }
-
-    run_auto_searches();
 });
 
 })(jQuery);