X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=5a18aa9e87a8e107484827cc0a12cda96152d316;hb=0f1ee05a66d356ff5fbf62353e6a599980ec9c02;hp=bed025828061f0fd021b84f6a4a7c5b33737f2c1;hpb=704338a8bd68c4c81732575e1694a717ca1e6ecc;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index bed0258..5a18aa9 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -144,7 +144,7 @@ if (mkws_config == null || typeof mkws_config != 'object') { // wrapper for jQuery lib function _make_mkws_team($, teamName) { var that = {}; - var m_termName = teamName; + var m_teamName = teamName; var m_submitted = false; var m_query; // initially undefined var m_sort = 'relevance'; @@ -190,53 +190,6 @@ function _make_mkws_team($, teamName) { var debug = mkws.debug_function; // local alias debug("start running MKWS"); - - { - - /* default mkws config */ - var config_default = { - use_service_proxy: true, - pazpar2_url: "http://mkws.indexdata.com/service-proxy/", - service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth", - lang: "", - sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]], - perpage_options: [10, 20, 30, 50], - sort_default: "relevance", - perpage_default: 20, - query_width: 50, - show_lang: true, /* show/hide language menu */ - show_sort: true, /* show/hide sort menu */ - show_perpage: true, /* show/hide perpage menu */ - lang_options: [], /* display languages links for given languages, [] for all */ - facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */ - responsive_design_width: undefined, /* a page with less pixel width considered as narrow */ - debug_level: 1, /* debug level for development: 0..2 */ - - dummy: "dummy" - }; - - /* Set global debug_level flag early so that debug() works */ - if (typeof mkws_config.debug_level !== 'undefined') { - mkws.debug_level = mkws_config.debug_level; - } else if (typeof config_default.debug_level !== 'undefined') { - mkws.debug_level = config_default.debug_level; - } - - // make sure the mkws_config is a valid hash - if (!$.isPlainObject(mkws_config)) { - debug("ERROR: mkws_config is not an JS object, ignore it...."); - mkws_config = {}; - } - - /* override standard config values by function parameters */ - for (var k in config_default) { - if (typeof mkws_config[k] === 'undefined') - mkws_config[k] = config_default[k]; - //debug("Set config: " + k + ' => ' + mkws_config[k]); - } - } - - m_sort = mkws_config.sort_default; debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to m_sort"); @@ -309,7 +262,7 @@ function _make_mkws_team($, teamName) { } // navi - var results = document.getElementById("mkwsRecords"); + var results = $("#mkwsRecords"); var html = []; for (var i = 0; i < data.hits.length; i++) { @@ -321,7 +274,7 @@ function _make_mkws_team($, teamName) { html.push(renderDetails(m_curDetRecData)); } } - replaceHtml(results, html.join('')); + results.html(html.join('')); } @@ -375,9 +328,9 @@ function _make_mkws_team($, teamName) { } } - var termlist = document.getElementById("mkwsTermlists"); + var termlist = $("#mkwsTermlists"); if (termlist) - replaceHtml(termlist, acc.join('')); + termlist.html(acc.join('')); } @@ -466,12 +419,12 @@ function _make_mkws_team($, teamName) { // when search button pressed function onFormSubmitEventHandler() { - newSearch(document.mkwsSearchForm.mkwsQuery.value); + that.newSearch(document.mkwsSearchForm.mkwsQuery.value); return false; } - function newSearch(query, sort, targets, windowid) + that.newSearch = function(query, sort, targets, windowid) { debug("newSearch: " + query); @@ -792,21 +745,6 @@ function _make_mkws_team($, teamName) { } - function replaceHtml(el, html) { - var oldEl = typeof el === "string" ? document.getElementById(el) : el; - /*@cc_on // Pure innerHTML is slightly faster in IE - oldEl.innerHTML = html; - return oldEl; - @*/ - var newEl = oldEl.cloneNode(false); - newEl.innerHTML = html; - oldEl.parentNode.replaceChild(newEl, oldEl); - /* Since we just removed the old element from the DOM, return a reference - to the new element, which can be used to restore variable references. */ - return newEl; - }; - - function renderDetails(data, marker) { var template = loadTemplate("Record"); @@ -1330,13 +1268,18 @@ function _mkws_jquery_plugin ($) { // wrapper to call _make_mkws_team() after page load (function (j) { function log(s) { - if (console && console.log) console.log(s); + if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */ + return; + } + console.log(s); } + // enable before page load, so we could call it before mkws() runs _mkws_jquery_plugin(j); $(document).ready(function() { log("on load ready"); + default_mkws_config(); // Backwards compatibility: set new magic class names on any // elements that have the old magic IDs. @@ -1354,7 +1297,7 @@ function _mkws_jquery_plugin ($) { // Backwards compatibility: the special-case undefined team // ### Will not be necessary when non-default teams are working - mkws.teams[''] = _make_mkws_team(j, undefined); + mkws.teams['AUTO'] = _make_mkws_team(j, "AUTO"); log("Made the unnamed MKWS team"); // Find all nodes with class (NOT id) mkwsRecords, and @@ -1385,27 +1328,72 @@ function _mkws_jquery_plugin ($) { }); if (mkws_config.use_service_proxy) { - mkws.authenticate_session(mkws_config.service_proxy_auth, - mkws_config.service_proxy_auth_domain, - mkws_config.pazpar2_url); + authenticate_session(mkws_config.service_proxy_auth, + mkws_config.service_proxy_auth_domain, + mkws_config.pazpar2_url); } else { // raw pp2 - mkws.run_auto_searches(); + run_auto_searches(); } }); + function default_mkws_config() { + /* default mkws config */ + var config_default = { + use_service_proxy: true, + pazpar2_url: "http://mkws.indexdata.com/service-proxy/", + service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth", + lang: "", + sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]], + perpage_options: [10, 20, 30, 50], + sort_default: "relevance", + perpage_default: 20, + query_width: 50, + show_lang: true, /* show/hide language menu */ + show_sort: true, /* show/hide sort menu */ + show_perpage: true, /* show/hide perpage menu */ + lang_options: [], /* display languages links for given languages, [] for all */ + facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */ + responsive_design_width: undefined, /* a page with less pixel width considered as narrow */ + debug_level: 1, /* debug level for development: 0..2 */ + + dummy: "dummy" + }; + + /* Set global debug_level flag early so that debug() works */ + if (typeof mkws_config.debug_level !== 'undefined') { + mkws.debug_level = mkws_config.debug_level; + } else if (typeof config_default.debug_level !== 'undefined') { + mkws.debug_level = config_default.debug_level; + } + + // make sure the mkws_config is a valid hash + if (!$.isPlainObject(mkws_config)) { + debug("ERROR: mkws_config is not an JS object, ignore it...."); + mkws_config = {}; + } + + /* override standard config values by function parameters */ + for (var k in config_default) { + if (typeof mkws_config[k] === 'undefined') + mkws_config[k] = config_default[k]; + //debug("Set config: " + k + ' => ' + mkws_config[k]); + } + } + + /* * Run service-proxy authentication in background (after page load). * The username/password is configured in the apache config file * for the site. */ - mkws.authenticate_session = function(auth_url, auth_domain, pp2_url) { - debug("Run service proxy auth URL: " + auth_url); + function authenticate_session(auth_url, auth_domain, pp2_url) { + console.log("Run service proxy auth URL: " + auth_url); if (!auth_domain) { auth_domain = pp2_url.replace(/^(https?:)?\/\/(.*?)\/.*/, '$2'); - debug("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'"); + console.log("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'"); } var request = new pzHttpRequest(auth_url, function(err) { @@ -1424,36 +1412,34 @@ function _mkws_jquery_plugin ($) { return; } - debug("Service proxy auth successfully done"); + console.log("Service proxy auth successfully done"); mkws.authenticated = true; - mkws.run_auto_searches(); + run_auto_searches(); }); } - mkws.run_auto_searches = function() { - debug("running auto searches"); + function run_auto_searches() { + console.log("running auto searches"); - $('[id^="mkwsRecords"]').each(function () { - var node = $(this); + for (var teamName in mkws.teams) { + // ### should check mkwsTermlist as well, for facet-only teams + var node = $('.mkwsRecords.mkwsTeam_' + teamName); var query = node.attr('autosearch'); + console.log("teamName '" + teamName + "', node=" + node + ", class='" + node.className + "', query=" + query); if (query) { - var windowid = undefined; - var id = node.attr('id'); - if (id.match(/^mkwsRecords_/, '')) { - windowid = id.replace(/^mkwsRecords_/, ''); - } - var sort = node.attr('sort'); var targets = node.attr('targets'); var s = "running auto search: '" + query + "'"; - if (windowid) s += " [windowid '" + windowid + "']"; + if (teamName) s += " [teamName '" + teamName + "']"; if (sort) s += " sorted by '" + sort + "'"; if (targets) s += " in targets '" + targets + "'"; - debug(s); - newSearch(query, sort, targets, windowid); + console.log(s); + var team = mkws.teams[teamName]; + console.log($.toJSON(team)); + team.newSearch(query, sort, targets, teamName); } - }); + } } })(jQuery);