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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index b0f5f83..9ffe3e1 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;
@@ -264,9 +268,12 @@ function my_onshow(data) {
     var html = [];
     for (var i = 0; i < data.hits.length; i++) {
         var hit = data.hits[i];
-	html.push('<div class="record" id="mkwsRecdiv_'+hit.recid+'" >');
-	html.push(renderSummary(hit));
-      	html.push('</div>');
+	html.push('<div class="record" id="mkwsRecdiv_' + hit.recid + '" >',
+		  renderSummary(hit),
+      		  '</div>');
+	if (hit.recid == curDetRecId) {
+            html.push(renderDetails(curDetRecData));
+	}
     }
     replaceHtml(results, html.join(''));
 }
@@ -274,20 +281,13 @@ function my_onshow(data) {
 
 function renderSummary(hit)
 {
-    var html = [];
-    html.push('<a href="#" id="mkwsRec_'+hit.recid
-              +'" onclick="mkws.showDetails(this.id);return false;"><b>'
-              + hit["md-title"] +' </b></a>');
-    if (hit["md-title-remainder"] !== undefined) {
-	html.push('<span>' + hit["md-title-remainder"] + ' </span>');
-    }
-    if (hit["md-title-responsibility"] !== undefined) {
-    	html.push('<span><i>'+hit["md-title-responsibility"]+'</i></span>');
+    if (mkws.templateSummary === undefined) {
+	loadTemplate("Summary");
     }
-    if (hit.recid == curDetRecId) {
-        html.push(renderDetails(curDetRecData));
-    }
-    return html.join('');
+
+    hit._id = "mkwsRec_" + hit.recid;
+    hit._onclick = "mkws.showDetails(this.id);return false;"
+    return mkws.templateSummary(hit);
 }
 
 
@@ -330,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) {
@@ -412,12 +413,24 @@ function domReady ()
 // when search button pressed
 function onFormSubmitEventHandler()
 {
+    newSearch(document.mkwsSearchForm.mkwsQuery.value);
+    return false;
+}
+
+function newSearch(query)
+{
+    if (!mkws.authenticated) {
+	alert("searching before authentication");
+	return;
+    }
+
+    mkws.filters = []
+    redraw_navi();
     resetPage();
     loadSelect();
-    triggerSearch();
+    triggerSearch(query);
     mkws.switchView('records'); // In case it's configured to start off as hidden
     submitted = true;
-    return false;
 }
 
 function onSelectDdChange()
@@ -425,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;
 }
 
@@ -435,11 +448,16 @@ function resetPage()
     totalRec = 0;
 }
 
-function triggerSearch ()
+function triggerSearch (query)
 {
     var pp2filter = "";
     var pp2limit = "";
 
+    // Re-use previous query if a new one is not specified
+    if (query) {
+	mkws.query = query;
+    }
+
     for (var i in mkws.filters) {
 	var filter = mkws.filters[i];
 	if (filter.id) {
@@ -453,15 +471,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;
     }
@@ -786,6 +804,18 @@ function defaultTemplate(name)
 	</tr>\
       </table>\
 ';
+    } else if (name === "Summary") {
+	return '\
+      <a href="#" id="{{_id}}" onclick="{{_onclick}}">\
+	<b>{{md-title}}</b>\
+      </a>\
+      {{#if md-title-remainder}}\
+        <span>{{md-title-remainder}}</span>\
+      {{/if}}\
+      {{#if md-title-responsibility}}\
+    	<span><i>{{md-title-responsibility}}</i></span>\
+      {{/if}}\
+';
     }
 
     var s = "There is no default '" + name +"' template!";
@@ -884,6 +914,19 @@ 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');
+	debug("running auto search: '" + query + "' sorted by '" + sort + "'");
+	// ### currently ignoring sort
+	newSearch(query);
+    }
+}
+
+
 function mkws_set_lang()  {
     var lang = $.parseQuerystring().lang || mkws_config.lang;
     if (!lang || !mkws.locale_lang[lang]) {
@@ -912,7 +955,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++) {
@@ -921,7 +964,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>';
@@ -974,7 +1017,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();
     });
 }