X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=ec346d25b8a11f855630701b063ea513fbfc4481;hb=3fdc091d1c577fc776bad0750efbeb2b9f59184a;hp=26d1fdb5cd9fa3531699804555ef61ac1c52a60d;hpb=5347324e6cdd62e620eb6961e139f1bdc038028d;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 26d1fdb..ec346d2 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;
@@ -326,7 +330,8 @@ function my_onterm(data) {
     }
 
     var termlist = document.getElementById("mkwsTermlists");
-    replaceHtml(termlist, acc.join(''));
+    if (termlist)
+	replaceHtml(termlist, acc.join(''));
 }
 
 function add_single_facet(acc, caption, data, max, pzIndex) {
@@ -408,12 +413,24 @@ function domReady ()
 // when search button pressed
 function onFormSubmitEventHandler()
 {
+    newSearch(document.mkwsSearchForm.mkwsQuery.value);
+    return false;
+}
+
+function newSearch(query, sort, targets)
+{
+    if (!mkws.authenticated) {
+	alert("searching before authentication");
+	return;
+    }
+
+    mkws.filters = []
+    redraw_navi();
     resetPage();
     loadSelect();
-    triggerSearch();
+    triggerSearch(query, sort, targets);
     mkws.switchView('records'); // In case it's configured to start off as hidden
     submitted = true;
-    return false;
 }
 
 function onSelectDdChange()
@@ -421,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;
 }
 
@@ -431,17 +448,34 @@ function resetPage()
     totalRec = 0;
 }
 
-function triggerSearch ()
+function triggerSearch (query, sort, targets)
 {
     var pp2filter = "";
     var pp2limit = "";
 
+    // 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;
+	    if (filter.id.match(/^[a-z:]+[=~]/)) {
+		log("filter '" + filter + "' already begins with SETTING OP");
+	    } else {
+		filter.id = 'pz:id=' + filter.id;
+	    }
+	    pp2filter += filter.id;
 	} else {
 	    if (pp2limit)
 		pp2limit += ",";
@@ -449,15 +483,15 @@ function triggerSearch ()
 	}
     }
 
-    debug("triggerSearch: filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit);
-    my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, pp2filter, undefined, { limit: pp2limit });
+    debug("triggerSearch(" + mkws.query + "): filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + 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;
     }
@@ -892,6 +926,22 @@ function mkws_html_all() {
     }
 }
 
+
+function run_auto_searches() {
+    var node = $('#mkwsRecords');
+    if (node.attr('autosearch')) {
+	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);
+    }
+}
+
+
 function mkws_set_lang()  {
     var lang = $.parseQuerystring().lang || mkws_config.lang;
     if (!lang || !mkws.locale_lang[lang]) {
@@ -920,7 +970,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++) {
@@ -929,7 +979,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>';
@@ -982,7 +1032,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();
     });
 }