projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rationalise the confusion between mkws_config.sort_default and mkws.sort.
[mkws-moved-to-github.git]
/
tools
/
htdocs
/
mkws.js
diff --git
a/tools/htdocs/mkws.js
b/tools/htdocs/mkws.js
index
01917c2
..
9ffe3e1
100644
(file)
--- a/
tools/htdocs/mkws.js
+++ b/
tools/htdocs/mkws.js
@@
-5,6
+5,8
@@
// Set up namespace and some state.
var mkws = {
// Set up namespace and some state.
var mkws = {
+ sort: 'relevance',
+ authenticated: false,
filters: [],
};
filters: [],
};
@@
-191,6
+193,9
@@
Handlebars.registerHelper('commaList', function(items, options) {
}
}
}
}
+mkws.sort = mkws_config.sort_default;
+debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to mkws.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;
if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
debug("Reset query width: " + mkws_config.query_width);
mkws_config.query_width = 50;
@@
-231,7
+236,6
@@
var recPerPage = 20;
var totalRec = 0;
var curDetRecId = '';
var curDetRecData = null;
var totalRec = 0;
var curDetRecId = '';
var curDetRecData = null;
-var curSort = 'relevance';
var submitted = false;
var SourceMax = 16;
var SubjectMax = 10;
var submitted = false;
var SourceMax = 16;
var SubjectMax = 10;
@@
-260,7
+264,6
@@
function my_onshow(data) {
// navi
var results = document.getElementById("mkwsRecords");
// navi
var results = document.getElementById("mkwsRecords");
- debug("my_onshow, results = " + results);
var html = [];
for (var i = 0; i < data.hits.length; i++) {
var html = [];
for (var i = 0; i < data.hits.length; i++) {
@@
-416,6
+419,11
@@
function onFormSubmitEventHandler()
function newSearch(query)
{
function newSearch(query)
{
+ if (!mkws.authenticated) {
+ alert("searching before authentication");
+ return;
+ }
+
mkws.filters = []
redraw_navi();
resetPage();
mkws.filters = []
redraw_navi();
resetPage();
@@
-430,7
+438,7
@@
function onSelectDdChange()
if (!submitted) return false;
resetPage();
loadSelect();
if (!submitted) return false;
resetPage();
loadSelect();
- my_paz.show(0, recPerPage, curSort);
+ my_paz.show(0, recPerPage, mkws.sort);
return false;
}
return false;
}
@@
-464,14
+472,14
@@
function triggerSearch (query)
}
debug("triggerSearch(" + mkws.query + "): filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit);
}
debug("triggerSearch(" + mkws.query + "): filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit);
- my_paz.search(mkws.query, recPerPage, curSort, pp2filter, undefined, { limit: pp2limit });
+ my_paz.search(mkws.query, recPerPage, mkws.sort, pp2filter, undefined, { limit: pp2limit });
}
function loadSelect ()
{
if (document.mkwsSelect) {
if (document.mkwsSelect.mkwsSort)
}
function loadSelect ()
{
if (document.mkwsSelect) {
if (document.mkwsSelect.mkwsSort)
- curSort = document.mkwsSelect.mkwsSort.value;
+ mkws.sort = document.mkwsSelect.mkwsSort.value;
if (document.mkwsSelect.mkwsPerpage)
recPerPage = document.mkwsSelect.mkwsPerpage.value;
}
if (document.mkwsSelect.mkwsPerpage)
recPerPage = document.mkwsSelect.mkwsPerpage.value;
}
@@
-910,7
+918,7
@@
function mkws_html_all() {
function run_auto_searches() {
var node = $('#mkwsRecords');
if (node.attr('autosearch')) {
function run_auto_searches() {
var node = $('#mkwsRecords');
if (node.attr('autosearch')) {
- var query = node.attr('query');
+ var query = node.attr('autosearch');
var sort = node.attr('sort');
debug("running auto search: '" + query + "' sorted by '" + sort + "'");
// ### currently ignoring sort
var sort = node.attr('sort');
debug("running auto search: '" + query + "' sorted by '" + sort + "'");
// ### currently ignoring sort
@@
-947,7
+955,7
@@
function mkws_html_switch() {
}
function mkws_html_sort() {
}
function mkws_html_sort() {
- debug("HTML sort");
+ debug("HTML sort, mkws.sort = '" + mkws.sort + "'");
var sort_html = '<select name="mkwsSort" id="mkwsSort">';
for(var i = 0; i < mkws_config.sort_options.length; i++) {
var sort_html = '<select name="mkwsSort" id="mkwsSort">';
for(var i = 0; i < mkws_config.sort_options.length; i++) {
@@
-956,7
+964,7
@@
function mkws_html_sort() {
var val = opt.length == 1 ? opt[0] : opt[1];
sort_html += '<option value="' + key + '"';
var val = opt.length == 1 ? opt[0] : opt[1];
sort_html += '<option value="' + key + '"';
- if (key == mkws_config.sort_default) {
+ if (mkws.sort == key || mkws.sort == val) {
sort_html += ' selected="selected"';
}
sort_html += '>' + M(val) + '</option>';
sort_html += ' selected="selected"';
}
sort_html += '>' + M(val) + '</option>';
@@
-1009,7
+1017,8
@@
function mkws_service_proxy_auth(auth_url, auth_domain) {
}
debug("Service proxy auth successfully done");
}
debug("Service proxy auth successfully done");
- mkws.service_proxy_auth = true;
+ mkws.authenticated = true;
+ run_auto_searches();
});
}
});
}
@@
-1247,8
+1256,6
@@
$(document).ready(function() {
mkws_config.error = e.message;
// alert(e.message);
}
mkws_config.error = e.message;
// alert(e.message);
}
-
- run_auto_searches();
});
})(jQuery);
});
})(jQuery);