Move curSort global into mkws.sort

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 62fed9a..1a80b10 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -5,6 +5,7 @@
 
 // Set up namespace and some state.
 var mkws = {
+    sort: 'relevance',
     authenticated: false,
     filters: [],
 };
@@ -232,7 +233,6 @@ var recPerPage = 20;
 var totalRec = 0;
 var curDetRecId = '';
 var curDetRecData = null;
-var curSort = 'relevance';
 var submitted = false;
 var SourceMax = 16;
 var SubjectMax = 10;
@@ -261,7 +261,6 @@ function my_onshow(data) {
 
     // navi
     var results = document.getElementById("mkwsRecords");
-    debug("my_onshow(" + JSON.stringify(data) + ")");
 
     var html = [];
     for (var i = 0; i < data.hits.length; i++) {
@@ -436,7 +435,7 @@ function onSelectDdChange()
     if (!submitted) return false;
     resetPage();
     loadSelect();
-    my_paz.show(0, recPerPage, curSort);
+    my_paz.show(0, recPerPage, mkws.sort);
     return false;
 }
 
@@ -470,14 +469,14 @@ function triggerSearch (query)
     }
 
     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)
-           curSort = document.mkwsSelect.mkwsSort.value;
+           mkws.sort = document.mkwsSelect.mkwsSort.value;
        if (document.mkwsSelect.mkwsPerpage)
            recPerPage = document.mkwsSelect.mkwsPerpage.value;
     }
@@ -916,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
@@ -1016,6 +1015,7 @@ function mkws_service_proxy_auth(auth_url, auth_domain) {
 
        debug("Service proxy auth successfully done");
        mkws.authenticated = true;
+       run_auto_searches();
     });
 }
 
@@ -1253,8 +1253,6 @@ $(document).ready(function() {
        mkws_config.error = e.message;
        // alert(e.message);
     }
-
-    run_auto_searches();
 });
 
 })(jQuery);