X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=3881729a31ae35e01f4910a9bb43056b640a3aa5;hb=82b68679aa23ae903fe3efe2976d5cf50d688f43;hp=b59a8d2361c1dac20fc5e84580ade09990a3f319;hpb=ba29f86a67e3bda1d0df2d14de803aab03991f40;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index b59a8d2..3881729 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,
@@ -228,6 +228,10 @@ function team($, teamName) {
m_sort = mkws_config.sort_default;
debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to m_sort");
+ if (!isNaN(parseInt(mkws_config.perpage_default))) {
+ m_perpage = parseInt(mkws_config.perpage_default);
+ }
+
// protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
if (mkws_config.pazpar2_url.match(/^\/\//)) {
mkws_config.pazpar2_url = document.location.protocol + mkws_config.pazpar2_url;
@@ -238,22 +242,18 @@ 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,
+ m_paz = new pz2({ "onshow": onShow,
"windowid": teamName,
"showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
"pazpar2path": mkws_config.pazpar2_url,
- "oninit": my_oninit,
- "onstat": my_onstat,
- "onterm": (mkws_config.facets.length ? my_onterm : undefined),
+ "oninit": onInit,
+ "onstat": onStat,
+ "onterm": (mkws_config.facets.length ? onTerm : undefined),
"termlist": mkws_config.facets.join(','),
- "onbytarget": my_onbytarget,
+ "onbytarget": onBytarget,
"usesessions" : mkws_config.use_service_proxy ? false : true,
"showResponseType": '', // or "json" (for debugging?)
- "onrecord": my_onrecord });
-
- if (!isNaN(parseInt(mkws_config.perpage_default))) {
- m_perpage = parseInt(mkws_config.perpage_default);
- }
+ "onrecord": onRecord });
// Finds the node of the specified class within the current team
@@ -274,14 +274,14 @@ function team($, teamName) {
//
// 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;
@@ -318,7 +318,7 @@ function team($, teamName) {
}
- function my_onstat(data, teamName) {
+ function onStat(data, teamName) {
debug("stat");
var stat = findnode('.mkwsStat');
if (stat.length === 0)
@@ -332,14 +332,14 @@ function team($, teamName) {
}
- function my_onterm(data, teamName) {
+ function onTerm(data, teamName) {
debug("term");
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;
}
@@ -353,11 +353,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] + "'");
}
@@ -367,7 +367,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++) {
@@ -377,7 +377,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 {
@@ -391,7 +391,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) {
@@ -402,7 +402,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);
@@ -416,7 +416,7 @@ function team($, teamName) {
}
- function my_onbytarget(data, teamName) {
+ function onBytarget(data, teamName) {
debug("target");
var targetDiv = findnode('.mkwsBytarget');
if (!targetDiv) {
@@ -456,8 +456,7 @@ function team($, teamName) {
}
- // ### doesn't need windowid
- function newSearch(query, sort, targets, windowid)
+ function newSearch(query, sort, targets)
{
debug("newSearch: " + query);
@@ -467,10 +466,10 @@ function team($, teamName) {
}
m_filters = []
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
- triggerSearch(query, sort, targets, windowid);
+ triggerSearch(query, sort, targets);
switchView('records'); // In case it's configured to start off as hidden
m_submitted = true;
}
@@ -493,8 +492,7 @@ function team($, teamName) {
}
- // ### doesn't need windowid
- function triggerSearch (query, sort, targets, windowid)
+ function triggerSearch (query, sort, targets)
{
var pp2filter = "";
var pp2limit = "";
@@ -507,7 +505,6 @@ function team($, teamName) {
m_sort = sort;
}
if (targets) {
- // ### should support multiple |-separated targets
m_filters.push({ id: targets, name: targets });
}
@@ -533,9 +530,7 @@ 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"
@@ -564,7 +559,7 @@ function team($, teamName) {
{
debug("limitTarget(id=" + id + ", name=" + name + ")");
m_filters.push({ id: id, name: name });
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -577,7 +572,7 @@ function team($, teamName) {
{
debug("limitQuery(field=" + field + ", value=" + value + ")");
m_filters.push({ field: field, value: value });
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -600,7 +595,7 @@ function team($, teamName) {
}
m_filters = newFilters;
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -625,7 +620,7 @@ function team($, teamName) {
}
m_filters = newFilters;
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -633,7 +628,7 @@ function team($, teamName) {
}
- function redraw_navi ()
+ function redrawNavi ()
{
var navi = findnode('.mkwsNavi');
if (!navi) return;
@@ -912,14 +907,13 @@ function team($, teamName) {
* All the HTML stuff to render the search forms and
* result pages.
*/
- // ### This and other multi-word identifiers should be camelCase
- function mkws_html_all() {
- mkws_set_lang();
+ function mkwsHtmlAll() {
+ mkwsSetLang();
if (mkws_config.show_lang)
- mkws_html_lang();
+ mkwsHtmlLang();
debug("HTML search form");
- mkws.handle_node_with_team(findnode('.mkwsSearch'), function(tname) {
+ mkws.handleNodeWithTeam(findnode('.mkwsSearch'), function(tname) {
this.html('\
';
node.html(ranking_data);
}
- mkws_html_switch();
-
- // ### 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() });
- }
+ mkwsHtmlSwitch();
var node;
node = findnode('.mkwsSearchForm');
@@ -1020,7 +1005,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 = ""
@@ -1033,7 +1018,7 @@ function team($, teamName) {
}
- function mkws_html_switch() {
+ function mkwsHtmlSwitch() {
debug("HTML switch for team " + m_teamName);
var node = findnode(".mkwsSwitch");
@@ -1051,7 +1036,7 @@ function team($, teamName) {
}
- function mkws_html_sort() {
+ function mkwsHtmlSort() {
debug("HTML sort, m_sort = '" + m_sort + "'");
var sort_html = '