X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=a76c65cbe92e126caabeaef6bf2a98eb3bbe17f2;hb=c8965c7ef5c9777b0aab59b9b6e8a141ee200f09;hp=72d2d96c0a74be37c1258f3b42a037f2f28a7b42;hpb=c0c6246c6e3a9baabeccf1ab8e8219a4b0e9f1be;p=mkws-moved-to-github.git
diff --git a/src/mkws-team.js b/src/mkws-team.js
index 72d2d96..a76c65c 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -40,7 +40,7 @@ function team($, teamName) {
that.currentPage = function() { return m_currentPage; };
that.currentRecordId = function() { return m_currentRecordId; };
that.currentRecordData = function() { return m_currentRecordData; };
- that.filters = function() { return m_filterSet.list(); };
+ that.filters = function() { return m_filterSet; };
that.config = function() { return m_config; };
// Accessor methods for individual widgets: writers
@@ -169,40 +169,43 @@ function team($, teamName) {
that.limitTarget = function(id, name) {
log("limitTarget(id=" + id + ", name=" + name + ")");
- m_filterSet.add(filter(id, name));
- triggerSearch();
+ m_filterSet.add(targetFilter(id, name));
+ if (m_query) triggerSearch();
return false;
};
that.limitQuery = function(field, value) {
log("limitQuery(field=" + field + ", value=" + value + ")");
- m_filterSet.add(filter(null, null, field, value));
- triggerSearch();
+ m_filterSet.add(fieldFilter(field, value));
+ if (m_query) triggerSearch();
return false;
};
that.limitCategory = function(id) {
log("limitCategory(id=" + id + ")");
- // ### Add a filter
- // ### triggerSearch() if there's a query
+ // Only one category filter at a time
+ m_filterSet.removeMatching(function(f) { return f.type === 'category' });
+ if (id !== '') m_filterSet.add(categoryFilter(id));
+ if (m_query) triggerSearch();
return false;
};
that.delimitTarget = function(id) {
log("delimitTarget(id=" + id + ")");
- m_filterSet.removeMatching(function(f) { return f.id });
- triggerSearch();
+ m_filterSet.removeMatching(function(f) { return f.type === 'target' });
+ if (m_query) triggerSearch();
return false;
};
that.delimitQuery = function(field, value) {
log("delimitQuery(field=" + field + ", value=" + value + ")");
- m_filterSet.removeMatching(function(f) { return f.field && field == f.field && value == f.value });
- triggerSearch();
+ m_filterSet.removeMatching(function(f) { return f.type == 'field' &&
+ field == f.field && value == f.value });
+ if (m_query) triggerSearch();
return false;
};
@@ -248,7 +251,7 @@ function team($, teamName) {
return;
}
- m_filterSet = filterSet(that);
+ m_filterSet.removeMatching(function(f) { return f.type !== 'category' });
triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery);
switchView('records'); // In case it's configured to start off as hidden
m_submitted = true;
@@ -260,51 +263,31 @@ function team($, teamName) {
resetPage();
queue("navi").publish();
- var pp2filter = "";
- var pp2limit = limit || "";
-
// Continue to use previous query/sort-order unless new ones are specified
- if (query) {
- m_query = query;
- }
- if (sortOrder) {
- m_sortOrder = sortOrder;
- }
- if (perpage) {
- m_perpage = perpage;
- }
- if (targets) {
- m_filterSet.add(filter(id, id));
- }
-
- pp2filter = m_filterSet.pp2filter();
- for (var i in m_filterSet.list()) {
- var filter = m_filterSet.list()[i];
- if (!filter.id) {
- if (pp2limit)
- pp2limit += ",";
- pp2limit += filter.field + "=" + filter.value.replace(/[\\|,]/g, '\\$&');
- }
- }
+ if (query) m_query = query;
+ if (sortOrder) m_sortOrder = sortOrder;
+ if (perpage) m_perpage = perpage;
+ if (targets) m_filterSet.add(targetFilter(targets, targets));
+
+ var pp2filter = m_filterSet.pp2filter();
+ var pp2limit = m_filterSet.pp2limit(limit);
+ var pp2catLimit = m_filterSet.pp2catLimit();
+ if (pp2catLimit) {
+ pp2filter = pp2filter ? pp2filter + "," + pp2catLimit : pp2catLimit;
+ }
var params = {};
- if (pp2limit) {
- params.limit = pp2limit;
- }
- if (maxrecs) {
- params.maxrecs = maxrecs;
- }
+ if (pp2limit) params.limit = pp2limit;
+ if (maxrecs) params.maxrecs = maxrecs;
if (torusquery) {
if (!mkws.config.use_service_proxy)
alert("can't narrow search by torusquery when Service Proxy is not in use");
params.torusquery = torusquery;
}
- log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filterSet.list()) + ", " +
+ log("triggerSearch(" + m_query + "): filters = " + m_filterSet.toJSON() + ", " +
"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_sortOrder, pp2filter, undefined, params);
}
@@ -437,7 +420,10 @@ function team($, teamName) {
});
// on first page, hide the termlist
- $(document).ready(function() { widgetNode("Termlists").hide(); });
+ $(document).ready(function() {
+ var t = widgetNode("Termlists");
+ if (t) t.hide();
+ });
var container = findnode(".mkwsMOTDContainer");
if (container.length) {
// Move the MOTD from the provided element down into the container
@@ -458,7 +444,27 @@ function team($, teamName) {
return m_config.lang;
}
+ // set or re-set "lang" URL parameter
+ function lang_url(lang) {
+ var query = location.search;
+ // no query parameters? done
+ if (!query) {
+ return "?lang=" + lang;
+ }
+
+ // parameter does not exists
+ if (!query.match(/[\?&]lang=/)) {
+ return query + "&lang=" + lang;
+ }
+
+ // replace existing parameter
+ query = query.replace(/\?lang=([^]*)/, "?lang=" + lang);
+ query = query.replace(/\&lang=([^]*)/, "&lang=" + lang);
+ return query;
+ }
+
+ // dynamic URL or static page? /path/foo?query=test
/* create locale language menu */
function mkwsHtmlLang() {
var lang_default = "en";
@@ -494,7 +500,7 @@ function team($, teamName) {
if (lang == l) {
data += ' ' + l + ' ';
} else {
- data += ' ' + l + ' '
+ data += ' ' + l + ' '
}
}