Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index d3adf6d..cb3e973 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -1,5 +1,4 @@
-/* A very simple client that shows a basic usage of the pz2.js
-*/
+/* MKWS, the MasterKey Widget Set. Copyright (C) 2013, Index Data */
 
 "use strict"; // HTML5: disable for debug_level >= 2
 
@@ -104,7 +103,7 @@ var debug = mkws.debug_function; // local alias
 
 
 Handlebars.registerHelper('json', function(obj) {
-    return JSON.stringify(obj);
+    return $.toJSON(obj);
 });
 
 
@@ -422,7 +421,9 @@ function onFormSubmitEventHandler()
 
 function newSearch(query, sort, targets)
 {
-    if (!mkws.authenticated) {
+    debug("newSearch: " + query);
+   
+    if (mkws_config.use_service_proxy && !mkws.authenticated) {
        alert("searching before authentication");
        return;
     }
@@ -486,7 +487,7 @@ function triggerSearch (query, sort, targets)
        }
     }
 
-    debug("triggerSearch(" + mkws.query + "): filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit);
+    debug("triggerSearch(" + mkws.query + "): filters = " + $.toJSON(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit);
     my_paz.search(mkws.query, recPerPage, mkws.sort, pp2filter, undefined, { limit: pp2limit });
 }
 
@@ -533,9 +534,9 @@ mkws.delimitQuery = function (field, value)
        if (filter.field &&
            field == filter.field &&
            value == filter.value) {
-           debug("delimitTarget() removing filter " + JSON.stringify(filter));
+           debug("delimitTarget() removing filter " + $.toJSON(filter));
        } else {
-           debug("delimitTarget() keeping filter " + JSON.stringify(filter));
+           debug("delimitTarget() keeping filter " + $.toJSON(filter));
            newFilters.push(filter);
        }
     }
@@ -556,9 +557,9 @@ mkws.delimitTarget = function (id)
     for (var i in mkws.filters) {
        var filter = mkws.filters[i];
        if (filter.id) {
-           debug("delimitTarget() removing filter " + JSON.stringify(filter));
+           debug("delimitTarget() removing filter " + $.toJSON(filter));
        } else {
-           debug("delimitTarget() keeping filter " + JSON.stringify(filter));
+           debug("delimitTarget() keeping filter " + $.toJSON(filter));
            newFilters.push(filter);
        }
     }
@@ -904,10 +905,14 @@ function mkws_html_all() {
 
     mkws_html_switch();
 
-    if (mkws_config.use_service_proxy)
+    if (mkws_config.use_service_proxy) {
          mkws_service_proxy_auth(mkws_config.service_proxy_auth,
                                  mkws_config.service_proxy_auth_domain,
                                  mkws_config.pazpar2_url);
+    } else {
+       // raw pp2
+       run_auto_searches();
+    }
 
     if (mkws_config.responsive_design_width) {
        // Responsive web design - change layout on the fly based on
@@ -932,6 +937,8 @@ function mkws_html_all() {
 
 
 function run_auto_searches() {
+    debug("run auto searches");
+
     var node = $('#mkwsRecords');
     if (node.attr('autosearch')) {
        var query = node.attr('autosearch');