X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=10a391562e178ee1d2ce4b64a17816920ada9f7f;hb=ea2128e0b27d5832ed2c6b85f046fcb1b3e603ff;hp=deb0649a832a1145d2684b447a01ce35fa9f7f64;hpb=1d5de7112ab9f1f3ffadf04539e787df0113ad13;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index deb0649..10a3915 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -5,7 +5,9 @@
// Set up namespace and some state.
var mkws = {
- filters: [],
+ sort: 'relevance',
+ authenticated: false,
+ filters: []
};
/*
@@ -101,29 +103,23 @@ mkws.debug_function = function (string) {
var debug = mkws.debug_function; // local alias
-Handlebars.registerHelper('link', function(a) {
- var result = "";
- for (var i in a) {
- if (i > 0) result += " ";
- var text = Handlebars.Utils.escapeExpression(a[i]);
- result += '' + text + '';
- }
-
- return new Handlebars.SafeString(result);
-});
-
-
Handlebars.registerHelper('json', function(obj) {
- return JSON.stringify(obj);
+ return $.toJSON(obj);
});
-// We need {{attr name}} because Handlebars can't parse {{@@name}}
+// We need {{attr '@name'}} because Handlebars can't parse {{@name}}
Handlebars.registerHelper('attr', function(attrName) {
- return this['@' + attrName];
+ return this[attrName];
});
+/*
+ * Use as follows: {{#if-any NAME1 having="NAME2"}}
+ * Applicable when NAME1 is the name of an array
+ * The guarded code runs only if at least one element of the NAME1
+ * array has a subelement called NAME2.
+ */
Handlebars.registerHelper('if-any', function(items, options) {
var having = options.hash.having;
for (var i in items) {
@@ -148,10 +144,23 @@ Handlebars.registerHelper('first', function(items, options) {
});
+Handlebars.registerHelper('commaList', function(items, options) {
+ var out = "";
+
+ for (var i in items) {
+ if (i > 0) out += ", ";
+ out += options.fn(items[i])
+ }
+
+ return out;
+});
+
+
{
/* default mkws config */
var config_default = {
use_service_proxy: true,
+ pazpar2_url: "http://mkws.indexdata.com/service-proxy/",
service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth",
lang: "",
sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
@@ -185,6 +194,11 @@ Handlebars.registerHelper('first', function(items, options) {
}
}
+mkws.sort = mkws_config.sort_default;
+debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to mkws.sort");
+
+mkws.usesessions = mkws_config.use_service_proxy ? false : true;
+
if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
debug("Reset query width: " + mkws_config.query_width);
mkws_config.query_width = 50;
@@ -207,13 +221,13 @@ for (var key in mkws_config) {
// autoInit is set to true on default
var my_paz = new pz2( { "onshow": my_onshow,
"showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
- "pazpar2path": mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/",
+ "pazpar2path": mkws_config.pazpar2_url,
"oninit": my_oninit,
"onstat": my_onstat,
"onterm": my_onterm,
"termlist": "xtargets,subject,author",
"onbytarget": my_onbytarget,
- "usesessions" : mkws_config.use_service_proxy ? false : true,
+ "usesessions" : mkws.usesessions,
"showResponseType": '', // or "json" (for debugging?)
"onrecord": my_onrecord } );
@@ -225,7 +239,6 @@ var recPerPage = 20;
var totalRec = 0;
var curDetRecId = '';
var curDetRecData = null;
-var curSort = 'relevance';
var submitted = false;
var SourceMax = 16;
var SubjectMax = 10;
@@ -258,24 +271,29 @@ function my_onshow(data) {
var html = [];
for (var i = 0; i < data.hits.length; i++) {
var hit = data.hits[i];
- html.push('