newSearch() is now an externally callable member function.

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 597e55b..1837390 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -419,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);
 
@@ -1283,8 +1283,12 @@ 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);
 
@@ -1308,7 +1312,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
@@ -1339,12 +1343,12 @@ 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();
        }
     });
 
@@ -1399,12 +1403,12 @@ function _mkws_jquery_plugin ($) {
      * 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) {
@@ -1423,36 +1427,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);