Interpret

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 01917c2..4635083 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -5,6 +5,7 @@
 
 // Set up namespace and some state.
 var mkws = {
+    authenticated: false,
     filters: [],
 };
 
@@ -260,7 +261,6 @@ function my_onshow(data) {
 
     // navi
     var results = document.getElementById("mkwsRecords");
-    debug("my_onshow, results = " + results);
 
     var html = [];
     for (var i = 0; i < data.hits.length; i++) {
@@ -416,6 +416,11 @@ function onFormSubmitEventHandler()
 
 function newSearch(query)
 {
+    if (!mkws.authenticated) {
+       alert("searching before authentication");
+       return;
+    }
+
     mkws.filters = []
     redraw_navi();
     resetPage();
@@ -910,7 +915,7 @@ function mkws_html_all() {
 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
@@ -1009,7 +1014,8 @@ function mkws_service_proxy_auth(auth_url, auth_domain) {
        }
 
        debug("Service proxy auth successfully done");
-       mkws.service_proxy_auth = true;
+       mkws.authenticated = true;
+       run_auto_searches();
     });
 }
 
@@ -1247,8 +1253,6 @@ $(document).ready(function() {
        mkws_config.error = e.message;
        // alert(e.message);
     }
-
-    run_auto_searches();
 });
 
 })(jQuery);