X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fhtdocs%2Fmkws.js;h=62fed9a607ad8825c684095ac3720ed1955a98a4;hb=7eb3ec5aa9b558216fc06205a4085d875f554a7c;hp=5b428bf9994ea47be1ece31b26920aa83b1ced14;hpb=72e0d26475c1cee0ef58f8a0e31b01cd1b58940a;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 5b428bf..62fed9a 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -5,6 +5,7 @@
// Set up namespace and some state.
var mkws = {
+ authenticated: false,
filters: [],
};
@@ -260,28 +261,34 @@ 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++) {
var hit = data.hits[i];
- html.push('
'
- +'
'
- + hit["md-title"] +' ');
- if (hit["md-title-remainder"] !== undefined) {
- html.push('
' + hit["md-title-remainder"] + ' ');
- }
- if (hit["md-title-responsibility"] !== undefined) {
- html.push('
'+hit["md-title-responsibility"]+'');
- }
- if (hit.recid == curDetRecId) {
+ html.push('
',
+ renderSummary(hit),
+ '
');
+ if (hit.recid == curDetRecId) {
html.push(renderDetails(curDetRecData));
- }
- html.push('
');
+ }
}
replaceHtml(results, html.join(''));
}
+
+function renderSummary(hit)
+{
+ if (mkws.templateSummary === undefined) {
+ loadTemplate("Summary");
+ }
+
+ hit._id = "mkwsRec_" + hit.recid;
+ hit._onclick = "mkws.showDetails(this.id);return false;"
+ return mkws.templateSummary(hit);
+}
+
+
function my_onstat(data) {
var stat = document.getElementById("mkwsStat");
if (stat == null)
@@ -321,7 +328,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) {
@@ -403,12 +411,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()
@@ -426,11 +446,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) {
@@ -444,8 +469,8 @@ 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, curSort, pp2filter, undefined, { limit: pp2limit });
}
function loadSelect ()
@@ -695,22 +720,16 @@ function replaceHtml(el, html) {
function renderDetails(data, marker)
{
if (mkws.templateRecord === undefined) {
- maybeLoadTemplate("Record");
- }
-
- var details;
- if (mkws.templateRecord) {
- var template = mkws.templateRecord;
- details = template(data);
- } else {
- details = defaultRenderDetails(data, marker);
+ loadTemplate("Record");
}
+ var template = mkws.templateRecord;
+ var details = template(data);
return '' + details + '
';
}
-function maybeLoadTemplate(name)
+function loadTemplate(name)
{
var source = $("#mkwsTemplate" + name).html();
if (!source) {
@@ -783,6 +802,18 @@ function defaultTemplate(name)
\
\
';
+ } else if (name === "Summary") {
+ return '\
+ \
+ {{md-title}}\
+ \
+ {{#if md-title-remainder}}\
+ {{md-title-remainder}}\
+ {{/if}}\
+ {{#if md-title-responsibility}}\
+ {{md-title-responsibility}}\
+ {{/if}}\
+';
}
var s = "There is no default '" + name +"' template!";
@@ -791,60 +822,6 @@ function defaultTemplate(name)
}
-function defaultRenderDetails(data, marker)
-{
- var details = '';
- if (marker) details += ''+ marker + ' |
';
-
- var locations = [];
- for (var i in data.location) {
- locations.push(data.location[i]['@name']);
- }
-
- details += renderField("Title", data["md-title"], data["md-title-remainder"], data["md-title-responsibility"]);
- details += renderField("Date", data["md-date"]);
- details += renderField("Author", data["md-author"]);
- details += renderField("URL", data["md-electronic-url"]);
- details += renderField("Subject", data["location"][0]["md-subject"]);
- if (locations.length == 0) {
- details += 'No locations for record! |
';
- } else {
- details += renderField("Location" + (locations.length == 1 ? "" : "s"), locations);
- }
- details += '
';
- return details;
-}
-
-
-function renderField(caption, data, data2, data3) {
- if (data === undefined) {
- return "";
- }
-
- var res = "";
- for (var i = 0; i < data.length; i++) {
- var s = data[i];
- if (i > 0)
- res += ", ";
-
- if (caption == "URL")
- s = '' + s + '';
-
- res += s
- }
-
- if (data2 != undefined) {
- res = res + " (" + data2 + ")";
- }
-
- if (data3 != undefined) {
- res = res + " " + data3 + "";
- }
-
- return '' + M(caption) + ' | ' + res + ' |
';
-}
-
-
/*
* All the HTML stuff to render the search forms and
* result pages.
@@ -935,6 +912,19 @@ function mkws_html_all() {
}
}
+
+function run_auto_searches() {
+ var node = $('#mkwsRecords');
+ if (node.attr('autosearch')) {
+ var query = node.attr('query');
+ 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]) {
@@ -1025,7 +1015,7 @@ function mkws_service_proxy_auth(auth_url, auth_domain) {
}
debug("Service proxy auth successfully done");
- mkws.service_proxy_auth = true;
+ mkws.authenticated = true;
});
}
@@ -1263,6 +1253,8 @@ $(document).ready(function() {
mkws_config.error = e.message;
// alert(e.message);
}
+
+ run_auto_searches();
});
})(jQuery);