var m_paz; // will be initialised below
var m_template = {};
- that.toString = function() { return '[Team ' + teamName + ']'; }
+ that.toString = function() { return '[Team ' + teamName + ']'; };
// Accessor methods for individual widgets: readers
- that.name = function() { return m_teamName; }
- that.submitted = function() { return m_submitted; }
- that.perpage = function() { return m_perpage; }
- that.totalRecordCount = function() { return m_totalRecordCount; }
- that.currentPage = function() { return m_currentPage; }
- that.currentRecordId = function() { return m_currentRecordId; }
- that.currentRecordData = function() { return m_currentRecordData; }
- that.filters = function() { return m_filters; }
+ that.name = function() { return m_teamName; };
+ that.submitted = function() { return m_submitted; };
+ that.perpage = function() { return m_perpage; };
+ that.totalRecordCount = function() { return m_totalRecordCount; };
+ that.currentPage = function() { return m_currentPage; };
+ that.currentRecordId = function() { return m_currentRecordId; };
+ that.currentRecordData = function() { return m_currentRecordData; };
+ that.filters = function() { return m_filters; };
// Accessor methods for individual widgets: writers
that.set_sortOrder = function(val) { m_sortOrder = val };
function log(s) {
var now = $.now();
- var timestamp = ((now - m_logTime.start)/1000).toFixed(3) + " (+" + ((now - m_logTime.last)/1000).toFixed(3) + ") "
+ var timestamp = (((now - m_logTime.start)/1000).toFixed(3) + " (+" +
+ ((now - m_logTime.last)/1000).toFixed(3) + ") ");
m_logTime.last = now;
-
mkws.log(m_teamName + ": " + timestamp + s);
}
that.log = log;
log("start running MKWS");
- m_sortOrder = mkws_config.sort_default;
- m_perpage = mkws_config.perpage_default;
+ m_sortOrder = mkws.config.sort_default;
+ m_perpage = mkws.config.perpage_default;
log("Create main pz2 object");
// 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({ "windowid": teamName,
- "pazpar2path": mkws_config.pazpar2_url,
- "usesessions" : mkws_config.use_service_proxy ? false : true,
+ "pazpar2path": mkws.config.pazpar2_url,
+ "usesessions" : mkws.config.use_service_proxy ? false : true,
"oninit": onInit,
"onbytarget": onBytarget,
"onstat": onStat,
- "onterm": (mkws_config.facets.length ? onTerm : undefined),
+ "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(',')
+ "termlist": mkws.config.facets.join(',')
});
}
}
return false;
- }
+ };
that.limitTarget = function(id, name)
m_filters.push({ id: id, name: name });
triggerSearch();
return false;
- }
+ };
that.limitQuery = function(field, value)
m_filters.push({ field: field, value: value });
triggerSearch();
return false;
- }
+ };
that.delimitTarget = function(id)
{
log("delimitTarget(id=" + id + ")");
- var newFilters = [];
- for (var i in m_filters) {
- var filter = m_filters[i];
- if (filter.id) {
- log("delimitTarget() removing filter " + $.toJSON(filter));
- } else {
- log("delimitTarget() keeping filter " + $.toJSON(filter));
- newFilters.push(filter);
- }
- }
- m_filters = newFilters;
-
+ removeMatchingFilters(function(f) { return f.id });
triggerSearch();
return false;
- }
+ };
that.delimitQuery = function(field, value)
{
log("delimitQuery(field=" + field + ", value=" + value + ")");
+ removeMatchingFilters(function(f) { return f.field && field == f.field && value == f.value });
+ triggerSearch();
+ return false;
+ };
+
+
+ function removeMatchingFilters(matchFn) {
var newFilters = [];
for (var i in m_filters) {
var filter = m_filters[i];
- if (filter.field &&
- field == filter.field &&
- value == filter.value) {
- log("delimitQuery() removing filter " + $.toJSON(filter));
+ if (matchFn(filter)) {
+ log("removeMatchingFilters() removing filter " + $.toJSON(filter));
} else {
- log("delimitQuery() keeping filter " + $.toJSON(filter));
+ log("removeMatchingFilters() keeping filter " + $.toJSON(filter));
newFilters.push(filter);
}
}
m_filters = newFilters;
-
- triggerSearch();
- return false;
}
{
m_currentPage = pageNum;
m_paz.showPage(m_currentPage - 1);
- }
+ };
that.pagerNext = function() {
m_paz.showNext();
m_currentPage++;
}
- }
+ };
that.pagerPrev = function() {
if (m_paz.showPrev() != false)
m_currentPage--;
- }
+ };
that.reShow = function() {
m_paz.show(0, m_perpage, m_sortOrder);
- }
+ };
function resetPage()
{
log("newSearch: " + query);
- if (mkws_config.use_service_proxy && !mkws.authenticated) {
+ if (mkws.config.use_service_proxy && !mkws.authenticated) {
alert("searching before authentication");
return;
}
params.limit = pp2limit;
}
- log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
+ log("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
// request the record
log("showDetails() requesting record '" + recId + "'");
m_paz.record(recId);
- }
+ };
/*
*/
function mkwsHtmlAll() {
mkwsSetLang();
- if (mkws_config.show_lang)
+ if (mkws.config.show_lang)
mkwsHtmlLang();
log("HTML search form");
findnode('.mkwsSearch').html('\
<form name="mkwsSearchForm" class="mkwsSearchForm mkwsTeam_' + m_teamName + '" action="" >\
- <input class="mkwsQuery mkwsTeam_' + m_teamName + '" type="text" size="' + mkws_config.query_width + '" />\
+ <input class="mkwsQuery mkwsTeam_' + m_teamName + '" type="text" size="' + mkws.config.query_width + '" />\
<input class="mkwsButton mkwsTeam_' + m_teamName + '" type="submit" value="' + M('Search') + '" />\
</form>');
</table>');
var ranking_data = '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
- if (mkws_config.show_sort) {
+ if (mkws.config.show_sort) {
ranking_data += M('Sort by') + ' ' + mkwsHtmlSort() + ' ';
}
- if (mkws_config.show_perpage) {
+ if (mkws.config.show_perpage) {
ranking_data += M('and show') + ' ' + mkwsHtmlPerpage() + ' ' + M('per page') + '.';
}
ranking_data += '</form>';
function mkwsSetLang() {
- var lang = getParameterByName("lang") || mkws_config.lang;
+ var lang = getParameterByName("lang") || mkws.config.lang;
if (!lang || !mkws.locale_lang[lang]) {
- mkws_config.lang = ""
+ mkws.config.lang = ""
} else {
- mkws_config.lang = lang;
+ mkws.config.lang = lang;
}
- log("Locale language: " + (mkws_config.lang ? mkws_config.lang : "none"));
- return mkws_config.lang;
+ log("Locale language: " + (mkws.config.lang ? mkws.config.lang : "none"));
+ return mkws.config.lang;
}
/* create locale language menu */
function mkwsHtmlLang() {
var lang_default = "en";
- var lang = mkws_config.lang || lang_default;
+ var lang = mkws.config.lang || lang_default;
var list = [];
/* display a list of configured languages, or all */
- var lang_options = mkws_config.lang_options || [];
+ var lang_options = mkws.config.lang_options || [];
var toBeIncluded = {};
for (var i = 0; i < lang_options.length; i++) {
toBeIncluded[lang_options[i]] = true;
log("HTML sort, m_sortOrder = '" + m_sortOrder + "'");
var sort_html = '<select class="mkwsSort mkwsTeam_' + m_teamName + '">';
- for(var i = 0; i < mkws_config.sort_options.length; i++) {
- var opt = mkws_config.sort_options[i];
+ for(var i = 0; i < mkws.config.sort_options.length; i++) {
+ var opt = mkws.config.sort_options[i];
var key = opt[0];
var val = opt.length == 1 ? opt[0] : opt[1];
log("HTML perpage, m_perpage = " + m_perpage);
var perpage_html = '<select class="mkwsPerpage mkwsTeam_' + m_teamName + '">';
- for(var i = 0; i < mkws_config.perpage_options.length; i++) {
- var key = mkws_config.perpage_options[i];
+ for(var i = 0; i < mkws.config.perpage_options.length; i++) {
+ var key = mkws.config.perpage_options[i];
perpage_html += '<option value="' + key + '"';
if (key == m_perpage) {
log(s);
newSearch(query, sortOrder, targets);
- }
+ };
// This function is taken from a StackOverflow answer
// different languages.
//
function M(word) {
- var lang = mkws_config.lang;
+ var lang = mkws.config.lang;
if (!lang || !mkws.locale_lang[lang])
return word;
{
var template = loadTemplate("Record");
var details = template(data);
- return '<div class="details mkwsTeam_' + m_teamName + '" id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
+ return '<div class="details mkwsTeam_' + m_teamName + '" ' +
+ 'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
}
that.renderDetails = renderDetails;
};
}
return queues[id];
- }
+ };
that.queue = queue;
mkwsHtmlAll()
projects / mkws-moved-to-github.git / blobdiff