X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=abee7d26a73bc9dc95002d1e8ec4ef363b8b8a04;hb=3707ef8981a7bb11586f4f35b4166aa41a29bb71;hp=2e0c5fd2d192f0a1b5d0b0a5522e54bab96119c7;hpb=23b60f99a77df0448ca337205716ea682b469611;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 2e0c5fd..abee7d2 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,87 +242,59 @@ 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 });
-
- 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);
- }
+ "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(',')
+ });
//
// pz2.js event handlers:
//
- function my_oninit(teamName) {
+ function onInit(teamName) {
debug("init");
m_paz.stat();
m_paz.bytarget();
}
- function my_onshow(data, teamName) {
- debug("show");
- m_totalRec = data.merged;
-
- var pager = findnode(".mkwsPager");
- if (pager.length) {
- pager.html(drawPager(data))
+ function onBytarget(data, teamName) {
+ debug("target");
+ var targetDiv = findnode('.mkwsBytarget');
+ if (!targetDiv) {
+ return;
}
- var results = findnode(".mkwsRecords");
- if (!results.length)
- return;
+ var table ='
' +
+ '' + M('Target ID') + ' | ' +
+ '' + M('Hits') + ' | ' +
+ '' + M('Diags') + ' | ' +
+ '' + M('Records') + ' | ' +
+ '' + M('State') + ' | ' +
+ '
';
- var html = [];
- for (var i = 0; i < data.hits.length; i++) {
- var hit = data.hits[i];
- html.push('',
- renderSummary(hit),
- '
');
- if (hit.recid == m_curDetRecId) {
- if (m_curDetRecData)
- html.push(renderDetails(m_curDetRecData));
- }
+ for (var i = 0; i < data.length; i++) {
+ table += "" + data[i].id +
+ " | " + data[i].hits +
+ " | " + data[i].diagnostic +
+ " | " + data[i].records +
+ " | " + data[i].state + " |
";
}
- results.html(html.join(''));
- }
-
- function renderSummary(hit)
- {
- var template = loadTemplate("Summary");
- hit._id = "mkwsRec_" + hit.recid;
- hit._onclick = "mkws.showDetails('" + m_teamName + "', this.id);return false;"
- return template(hit);
+ table += '
';
+ targetDiv.html(table);
}
- function my_onstat(data, teamName) {
+ function onStat(data, teamName) {
debug("stat");
var stat = findnode('.mkwsStat');
if (stat.length === 0)
@@ -332,14 +308,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 +329,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 +343,58 @@ function team($, teamName) {
}
- function add_single_facet(acc, caption, data, max, pzIndex) {
+ function onShow(data, teamName) {
+ debug("show");
+ m_totalRec = data.merged;
+
+ var pager = findnode(".mkwsPager");
+ if (pager.length) {
+ pager.html(drawPager(data))
+ }
+
+ var results = findnode(".mkwsRecords");
+ if (!results.length)
+ return;
+
+ var html = [];
+ for (var i = 0; i < data.hits.length; i++) {
+ var hit = data.hits[i];
+ html.push('',
+ renderSummary(hit),
+ '
');
+ if (hit.recid == m_curDetRecId) {
+ if (m_curDetRecData)
+ html.push(renderDetails(m_curDetRecData));
+ }
+ }
+ results.html(html.join(''));
+ }
+
+
+ function onRecord(data, args, teamName) {
+ debug("record: teamName=" + teamName + ", m_teamName=" + m_teamName);
+ // FIXME: record is async!!
+ clearTimeout(m_paz.recordTimer);
+ // in case on_show was faster to redraw element
+ var detRecordDiv = document.getElementById('mkwsDet_' + teamName + '_' + data.recid);
+ if (detRecordDiv) return;
+ m_curDetRecData = data;
+ var recordDiv = document.getElementById('mkwsRecdiv_' + teamName + '_' + m_curDetRecData.recid);
+ var html = renderDetails(m_curDetRecData);
+ recordDiv.innerHTML += html;
+ }
+
+
+ function renderSummary(hit)
+ {
+ var template = loadTemplate("Summary");
+ hit._id = "mkwsRec_" + hit.recid;
+ hit._onclick = "mkws.showDetails('" + m_teamName + "', this.id);return false;"
+ return template(hit);
+ }
+
+
+ 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 +404,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 +418,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,67 +429,20 @@ function team($, teamName) {
}
- function my_onrecord(data, args, teamName) {
- debug("record: teamName=" + teamName + ", m_teamName=" + m_teamName);
- // FIXME: record is async!!
- clearTimeout(m_paz.recordTimer);
- // in case on_show was faster to redraw element
- var detRecordDiv = document.getElementById('mkwsDet_' + teamName + '_' + data.recid);
- if (detRecordDiv) return;
- m_curDetRecData = data;
- var recordDiv = document.getElementById('mkwsRecdiv_' + teamName + '_' + m_curDetRecData.recid);
- var html = renderDetails(m_curDetRecData);
- recordDiv.innerHTML += html;
- }
-
-
- function my_onbytarget(data, teamName) {
- debug("target");
- var targetDiv = findnode('.mkwsBytarget');
- if (!targetDiv) {
- return;
- }
-
- var table ='
' +
- '' + M('Target ID') + ' | ' +
- '' + M('Hits') + ' | ' +
- '' + M('Diags') + ' | ' +
- '' + M('Records') + ' | ' +
- '' + M('State') + ' | ' +
- '
';
-
- for (var i = 0; i < data.length; i++) {
- table += "" + data[i].id +
- " | " + data[i].hits +
- " | " + data[i].diagnostic +
- " | " + data[i].records +
- " | " + data[i].state + " |
";
- }
-
- table += '
';
- targetDiv.html(table);
- }
-
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
// when search button pressed
- // ### This is closure, so can always just operate on its own team
function onFormSubmitEventHandler()
{
- mkws.handle_node_with_team(this, function (tname) {
- var val = findnode('.mkwsQuery').val();
- mkws.teams[tname].newSearch(val);
- });
-
+ var val = findnode('.mkwsQuery').val();
+ newSearch(val);
return false;
}
- // ### won't need to be externally visible once onFormSubmitEventHandler() is fixed.
- // ### doesn't need windowid
- that.newSearch = function(query, sort, targets, windowid)
+ function newSearch(query, sort, targets)
{
debug("newSearch: " + query);
@@ -472,11 +452,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;
}
@@ -498,8 +478,7 @@ function team($, teamName) {
}
- // ### doesn't need windowid
- function triggerSearch (query, sort, targets, windowid)
+ function triggerSearch (query, sort, targets)
{
var pp2filter = "";
var pp2limit = "";
@@ -512,7 +491,6 @@ function team($, teamName) {
m_sort = sort;
}
if (targets) {
- // ### should support multiple |-separated targets
m_filters.push({ id: targets, name: targets });
}
@@ -538,9 +516,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"
@@ -569,7 +545,7 @@ function team($, teamName) {
{
debug("limitTarget(id=" + id + ", name=" + name + ")");
m_filters.push({ id: id, name: name });
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -582,7 +558,7 @@ function team($, teamName) {
{
debug("limitQuery(field=" + field + ", value=" + value + ")");
m_filters.push({ field: field, value: value });
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -605,7 +581,7 @@ function team($, teamName) {
}
m_filters = newFilters;
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -630,7 +606,7 @@ function team($, teamName) {
}
m_filters = newFilters;
- redraw_navi();
+ redrawNavi();
resetPage();
loadSelect();
triggerSearch();
@@ -638,7 +614,7 @@ function team($, teamName) {
}
- function redraw_navi ()
+ function redrawNavi ()
{
var navi = findnode('.mkwsNavi');
if (!navi) return;
@@ -740,7 +716,7 @@ function team($, teamName) {
// switching view between targets and records
- that.switchView = function(view) {
+ function switchView(view) {
var targets = findnode('.mkwsTargets');
var results = findnode('.mkwsResults,.mkwsRecords');
var blanket = findnode('.mkwsBlanket');
@@ -772,6 +748,9 @@ function team($, teamName) {
}
+ that.switchView = switchView;
+
+
// detailed record drawing
that.showDetails = function (prefixRecId) {
var recId = prefixRecId.replace('mkwsRec_', '');
@@ -914,14 +893,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');
@@ -1022,7 +991,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 = ""
@@ -1035,7 +1004,7 @@ function team($, teamName) {
}
- function mkws_html_switch() {
+ function mkwsHtmlSwitch() {
debug("HTML switch for team " + m_teamName);
var node = findnode(".mkwsSwitch");
@@ -1053,7 +1022,7 @@ function team($, teamName) {
}
- function mkws_html_sort() {
+ function mkwsHtmlSort() {
debug("HTML sort, m_sort = '" + m_sort + "'");
var sort_html = '