X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fhtdocs%2Fmkws.js;h=65848c9000b8cb262c5d32626bbc17bb40adea08;hb=c7eb1ed9a3bdced7967bb0fa4bfd8d2fb72a20f9;hp=b844b58023c00e22c7824d55ba8b65c297a7e5ee;hpb=14e154c511d693fbf864e84e3c8a38a253b5f7d4;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index b844b58..65848c9 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -72,7 +72,7 @@ Handlebars.registerHelper('index1', function(obj) {
// Set up global mkws object. Contains truly global state such as SP
-// authentication, and a hash of team objects, indexed by windowid.
+// authentication, and a hash of team objects, indexed by team-name.
//
var mkws = {
authenticated: false,
@@ -142,12 +142,50 @@ var mkws = {
};
+// The following PubSub code is modified from the jQuery manual:
+// https://api.jquery.com/jQuery.Callbacks/
+//
+// Use as:
+// mkws.queue("eventName").subscribe(function(param1, param2 ...) { ... });
+// mkws.queue("eventName").publish(arg1, arg2, ...);
+
+(function() {
+ var queues = {};
+ mkws.queue = function(id) {
+ if (!queues[id]) {
+ var callbacks = $.Callbacks();
+ queues[id] = {
+ publish: callbacks.fire,
+ subscribe: callbacks.add,
+ unsubscribe: callbacks.remove
+ };
+ }
+ return queues[id];
+ }
+}());
+
+
// Define empty mkws_config for simple applications that don't define it.
if (mkws_config == null || typeof mkws_config != 'object') {
var mkws_config = {};
}
+// Factory function for widget objects.
+function widget($, team, type, node) {
+ var that = {
+ team: team,
+ type: type,
+ node: node
+ };
+
+ // ### More to do here, surely: e.g. wiring into the team
+ mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node);
+
+ return that;
+}
+
+
// Factory function for team objects. As much as possible, this uses
// only member variables (prefixed "m_") and inner functions with
// private scope. Some functions are visibl as member-functions to be
@@ -190,20 +228,8 @@ function team($, teamName) {
m_sort = mkws_config.sort_default;
debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to m_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;
- }
-
- for (var key in mkws_config) {
- if (mkws_config.hasOwnProperty(key)) {
- if (key.match(/^language_/)) {
- var lang = key.replace(/^language_/, "");
- // Copy custom languages into list
- mkws.locale_lang[lang] = mkws_config[key];
- debug("Added locally configured language '" + lang + "'");
- }
- }
+ if (!isNaN(parseInt(mkws_config.perpage_default))) {
+ m_perpage = parseInt(mkws_config.perpage_default);
}
// protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
@@ -216,44 +242,56 @@ function team($, teamName) {
// create a parameters array and pass it to the pz2's constructor
// then register the form submit event with the pz2.search function
// autoInit is set to true on default
- m_paz = new pz2({ "onshow": my_onshow,
- "windowid": teamName,
- "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
+ m_paz = new pz2({ "windowid": teamName,
"pazpar2path": mkws_config.pazpar2_url,
- "oninit": my_oninit,
- "onstat": my_onstat,
- "onterm": (mkws_config.facets.length ? my_onterm : undefined),
- "termlist": mkws_config.facets.join(','),
- "onbytarget": my_onbytarget,
"usesessions" : mkws_config.use_service_proxy ? false : true,
- "showResponseType": '', // or "json" (for debugging?)
- "onrecord": my_onrecord });
+ "oninit": onInit,
+ "onbytarget": onBytarget,
+ "onstat": onStat,
+ "onterm": (mkws_config.facets.length ? onTerm : undefined),
+ "onshow": onShow,
+ "onrecord": onRecord,
+ "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
+ "termlist": mkws_config.facets.join(','),
+ "showResponseType": '' // or "json" (for debugging?)
+ });
- if (!isNaN(parseInt(mkws_config.perpage_default))) {
- m_perpage = parseInt(mkws_config.perpage_default);
+
+ // Finds the node of the specified class within the current team
+ // Multiple OR-clauses separated by commas are handled
+ // More complex cases may not work
+ //
+ function findnode(selector, teamName) {
+ teamName = teamName || m_teamName;
+
+ selector = selector.split(',').map(function(s) {
+ return s + '.mkwsTeam_' + teamName;
+ }).join(',');
+
+ return $(selector);
}
//
// pz2.js event handlers:
//
- function my_oninit(teamName) {
+ function onInit(teamName) {
debug("init");
m_paz.stat();
m_paz.bytarget();
}
- function my_onshow(data, teamName) {
+ function onShow(data, teamName) {
debug("show");
m_totalRec = data.merged;
- var pager = $(".mkwsPager.mkwsTeam_" + m_teamName);
+ var pager = findnode(".mkwsPager");
if (pager.length) {
pager.html(drawPager(data))
}
- var results = $(".mkwsRecords.mkwsTeam_" + m_teamName);
+ var results = findnode(".mkwsRecords");
if (!results.length)
return;
@@ -281,9 +319,9 @@ function team($, teamName) {
}
- function my_onstat(data, teamName) {
+ function onStat(data, teamName) {
debug("stat");
- var stat = $('.mkwsStat.mkwsTeam_' + teamName);
+ var stat = findnode('.mkwsStat');
if (stat.length === 0)
return;
@@ -295,14 +333,14 @@ function team($, teamName) {
}
- function my_onterm(data, teamName) {
+ function onTerm(data, teamName) {
debug("term");
- var node = $(".mkwsTermlists.mkwsTeam_" + teamName);
+ var node = findnode(".mkwsTermlists");
if (node.length == 0) return;
// no facets: this should never happen
if (!mkws_config.facets || mkws_config.facets.length == 0) {
- alert("my_onterm called even though we have no facets: " + $.toJSON(data));
+ alert("onTerm called even though we have no facets: " + $.toJSON(data));
node.hide();
return;
}
@@ -316,11 +354,11 @@ function team($, teamName) {
for(var i = 0; i < facets.length; i++) {
if (facets[i] == "xtargets") {
- add_single_facet(acc, "Sources", data.xtargets, 16, null);
+ addSingleFacet(acc, "Sources", data.xtargets, 16, null);
} else if (facets[i] == "subject") {
- add_single_facet(acc, "Subjects", data.subject, 10, "subject");
+ addSingleFacet(acc, "Subjects", data.subject, 10, "subject");
} else if (facets[i] == "author") {
- add_single_facet(acc, "Authors", data.author, 10, "author");
+ addSingleFacet(acc, "Authors", data.author, 10, "author");
} else {
alert("bad facet configuration: '" + facets[i] + "'");
}
@@ -330,7 +368,7 @@ function team($, teamName) {
}
- function add_single_facet(acc, caption, data, max, pzIndex) {
+ function addSingleFacet(acc, caption, data, max, pzIndex) {
acc.push('
');
acc.push('
' + M(caption) + '
');
for (var i = 0; i < data.length && i < max; i++) {
@@ -340,7 +378,7 @@ function team($, teamName) {
if (!pzIndex) {
// Special case: target selection
acc.push('target_id='+data[i].id+' ');
- if (!target_filtered(data[i].id)) {
+ if (!targetFiltered(data[i].id)) {
action = 'mkws.limitTarget(\'' + m_teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
}
} else {
@@ -354,7 +392,7 @@ function team($, teamName) {
}
- function target_filtered(id) {
+ function targetFiltered(id) {
for (var i = 0; i < m_filters.length; i++) {
if (m_filters[i].id === id ||
m_filters[i].id === 'pz:id=' + id) {
@@ -365,7 +403,7 @@ function team($, teamName) {
}
- function my_onrecord(data, args, teamName) {
+ function onRecord(data, args, teamName) {
debug("record: teamName=" + teamName + ", m_teamName=" + m_teamName);
// FIXME: record is async!!
clearTimeout(m_paz.recordTimer);
@@ -379,9 +417,9 @@ function team($, teamName) {
}
- function my_onbytarget(data, teamName) {
+ function onBytarget(data, teamName) {
debug("target");
- var targetDiv = $('.mkwsBytarget.mkwsTeam_' + teamName);
+ var targetDiv = findnode('.mkwsBytarget');
if (!targetDiv) {
return;
}
@@ -413,16 +451,13 @@ function team($, teamName) {
// when search button pressed
function onFormSubmitEventHandler()
{
- mkws.handle_node_with_team(this, function (tname) {
- var val = $('.mkwsQuery.mkwsTeam_' + tname).val();
- mkws.teams[tname].newSearch(val);
- });
-
+ var val = findnode('.mkwsQuery').val();
+ newSearch(val);
return false;
}
- that.newSearch = function(query, sort, targets, windowid)
+ function newSearch(query, sort, targets)
{
debug("newSearch: " + query);
@@ -432,11 +467,11 @@ function team($, teamName) {
}
m_filters = []
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
- triggerSearch(query, sort, targets, windowid);
- that.switchView('records'); // In case it's configured to start off as hidden
+ triggerSearch(query, sort, targets);
+ switchView('records'); // In case it's configured to start off as hidden
m_submitted = true;
}
@@ -458,7 +493,7 @@ function team($, teamName) {
}
- function triggerSearch (query, sort, targets, windowid)
+ function triggerSearch (query, sort, targets)
{
var pp2filter = "";
var pp2limit = "";
@@ -471,7 +506,6 @@ function team($, teamName) {
m_sort = sort;
}
if (targets) {
- // ### should support multiple |-separated targets
m_filters.push({ id: targets, name: targets });
}
@@ -497,23 +531,23 @@ function team($, teamName) {
if (pp2limit) {
params.limit = pp2limit;
}
- if (windowid) {
- params.windowid = windowid;
- }
+
debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
+ // We can use: params.torusquery = "udb=NAME"
+ // Note: that won't work when running against raw pazpar2
m_paz.search(m_query, m_perpage, m_sort, pp2filter, undefined, params);
}
function loadSelect ()
{
- var node = $('.mkwsSort.mkwsTeam_' + m_teamName);
+ var node = findnode('.mkwsSort');
if (node.length && node.val() != m_sort) {
debug("changing m_sort from " + m_sort + " to " + node.val());
m_sort = node.val();
}
- node = $('.mkwsPerpage.mkwsTeam_' + m_teamName);
+ node = findnode('.mkwsPerpage');
if (node.length && node.val() != m_perpage) {
debug("changing m_perpage from " + m_perpage + " to " + node.val());
m_perpage = node.val();
@@ -526,7 +560,7 @@ function team($, teamName) {
{
debug("limitTarget(id=" + id + ", name=" + name + ")");
m_filters.push({ id: id, name: name });
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -539,7 +573,7 @@ function team($, teamName) {
{
debug("limitQuery(field=" + field + ", value=" + value + ")");
m_filters.push({ field: field, value: value });
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -562,7 +596,7 @@ function team($, teamName) {
}
m_filters = newFilters;
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -587,7 +621,7 @@ function team($, teamName) {
}
m_filters = newFilters;
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -595,9 +629,9 @@ function team($, teamName) {
}
- function redraw_navi ()
+ function redrawNavi ()
{
- var navi = $('.mkwsNavi.mkwsTeam_' + m_teamName);
+ var navi = findnode('.mkwsNavi');
if (!navi) return;
var text = "";
@@ -697,11 +731,11 @@ function team($, teamName) {
// switching view between targets and records
- that.switchView = function(view) {
- var targets = $('.mkwsTargets.mkwsTeam_' + m_teamName);
- var results = $('.mkwsResults.mkwsTeam_' + m_teamName + ',.mkwsRecords.mkwsTeam_' + m_teamName);
- var blanket = $('.mkwsBlanket.mkwsTeam_' + m_teamName);
- var motd = $('.mkwsMOTD.mkwsTeam_' + m_teamName);
+ function switchView(view) {
+ var targets = findnode('.mkwsTargets');
+ var results = findnode('.mkwsResults,.mkwsRecords');
+ var blanket = findnode('.mkwsBlanket');
+ var motd = findnode('.mkwsMOTD');
switch(view) {
case 'targets':
@@ -729,6 +763,9 @@ function team($, teamName) {
}
+ that.switchView = switchView;
+
+
// detailed record drawing
that.showDetails = function (prefixRecId) {
var recId = prefixRecId.replace('mkwsRec_', '');
@@ -767,9 +804,9 @@ function team($, teamName) {
if (template === undefined) {
// Fall back to generic template if there is no team-specific one
- var node = $(".mkwsTemplate_" + name + ".mkwsTeam_" + m_teamName)
+ var node = findnode(".mkwsTemplate_" + name);
if (!node.length) {
- node = $(".mkwsTemplate_" + name + ".mkwsTeam_ALL")
+ node = findnode(".mkwsTemplate_" + name, "ALL");
}
var source = node.html();
@@ -871,22 +908,18 @@ function team($, teamName) {
* All the HTML stuff to render the search forms and
* result pages.
*/
- function mkws_html_all() {
- mkws_set_lang();
+ function mkwsHtmlAll() {
+ mkwsSetLang();
if (mkws_config.show_lang)
- mkws_html_lang();
+ mkwsHtmlLang();
debug("HTML search form");
- // ### There is only one match here by design: fix not to bother looping
- $('.mkwsSearch.mkwsTeam_' + m_teamName).each(function (i, obj) {
- var node = this;
- mkws.handle_node_with_team(node, function(tname) {
- $(node).html('\
+ mkws.handleNodeWithTeam(findnode('.mkwsSearch'), function(tname) {
+ this.html('\
');
- });
});
debug("HTML records");
@@ -899,8 +932,8 @@ function team($, teamName) {
// .mkwsPager
// .mkwsNavi
// .mkwsRecords
- if ($(".mkwsResults.mkwsTeam_" + m_teamName).length) {
- $(".mkwsResults.mkwsTeam_" + m_teamName).html('\
+ if (findnode(".mkwsResults").length) {
+ findnode(".mkwsResults").html('\
\
\
\
@@ -921,52 +954,38 @@ function team($, teamName) {
');
}
- var node = $(".mkwsRanking.mkwsTeam_" + m_teamName);
+ var node = findnode(".mkwsRanking");
if (node.length) {
var ranking_data = '';
ranking_data += '';
node.html(ranking_data);
}
- mkws_html_switch();
+ mkwsHtmlSwitch();
- // ### Should not be in the team code, since window size is global
- if (mkws_config.responsive_design_width) {
- // Responsive web design - change layout on the fly based on
- // current screen width. Required for mobile devices.
- $(window).resize(function(e) { mkws.resize_page() });
- // initial check after page load
- $(document).ready(function() { mkws.resize_page() });
- }
-
- $('.mkwsSearchForm.mkwsTeam_' + m_teamName).each(function (i, obj) {
- debug("adding search-forms for team '" + m_teamName + "'");
- var node = this;
- mkws.handle_node_with_team(node, function(tname) {
- debug("adding search-form '" + tname + "' for team '" + m_teamName + "'");
- $(node).submit(onFormSubmitEventHandler);
- });
- });
-
- node = $('.mkwsSort.mkwsTeam_' + m_teamName);
+ var node;
+ node = findnode('.mkwsSearchForm');
+ if (node.length)
+ node.submit(onFormSubmitEventHandler);
+ node = findnode('.mkwsSort');
if (node.length)
node.change(onSelectDdChange);
- node = $('.mkwsPerpage.mkwsTeam_' + m_teamName);
+ node = findnode('.mkwsPerpage');
if (node.length)
node.change(onSelectDdChange);
// on first page, hide the termlist
- $(document).ready(function() { $(".mkwsTermlists.mkwsTeam_" + m_teamName).hide(); });
- var motd = $(".mkwsMOTD.mkwsTeam_" + m_teamName);
- var container = $(".mkwsMOTDContainer.mkwsTeam_" + m_teamName);
+ $(document).ready(function() { findnode(".mkwsTermlists").hide(); });
+ var motd = findnode(".mkwsMOTD");
+ var container = findnode(".mkwsMOTDContainer");
if (motd.length && container.length) {
// Move the MOTD from the provided element down into the container
motd.appendTo(container);
@@ -987,7 +1006,7 @@ function team($, teamName) {
}
- function mkws_set_lang() {
+ function mkwsSetLang() {
var lang = parseQuerystring().lang || mkws_config.lang;
if (!lang || !mkws.locale_lang[lang]) {
mkws_config.lang = ""
@@ -1000,16 +1019,16 @@ function team($, teamName) {
}
- function mkws_html_switch() {
+ function mkwsHtmlSwitch() {
debug("HTML switch for team " + m_teamName);
- var node = $(".mkwsSwitch.mkwsTeam_" + m_teamName);
+ var node = findnode(".mkwsSwitch");
node.append($('' + M('Records') + ''));
node.append($("", { text: " | " }));
node.append($('' + M('Targets') + ''));
debug("HTML targets");
- var node = $(".mkwsTargets.mkwsTeam_" + m_teamName);
+ var node = findnode(".mkwsTargets");
node.html('\
\
No information available yet.\
@@ -1018,7 +1037,7 @@ function team($, teamName) {
}
- function mkws_html_sort() {
+ function mkwsHtmlSort() {
debug("HTML sort, m_sort = '" + m_sort + "'");
var sort_html = '