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

diff --git a/examples/htdocs/jasmine-pp2.html b/examples/htdocs/jasmine-pp2.html
index b0b1c4c..0fda53f 100644 (file)
--- a/examples/htdocs/jasmine-pp2.html
+++ b/examples/htdocs/jasmine-pp2.html
@@ -5,6 +5,7 @@
     <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
+         jasmine: { "show_record_url": false },
          use_service_proxy: false,
          pazpar2_url : "/pazpar2/",
          perpage_default: 10

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 89c1ef6..002a705 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -5,26 +5,27 @@
  */
 
 // get references from mkws.js, lazy evaluation
-var debug = function (text) { mkws.debug_function(text) }
+var debug = function (text) {
+        mkws.debug_function(text)
+    }
 
 var get_hit_counter = function () {
-    // not yet here
-    if ($("#mkwsPager").length == 0)
-        return -1;
-
-    var found = $("#mkwsPager").text();
-    var re = /\([A-Za-z]+:\s+([0-9]+)\)/;
-    re.exec(found);
-    var hits = -1;
-
-    if (RegExp.$1) {
-        hits = parseInt(RegExp.$1);
-        expect(hits).toBeGreaterThan(0);
-    }
+        // not yet here
+        if ($("#mkwsPager").length == 0) return -1;
+
+        var found = $("#mkwsPager").text();
+        var re = /\([A-Za-z]+:\s+([0-9]+)\)/;
+        re.exec(found);
+        var hits = -1;
 
-    //debug("Hits: " + hits);
-    return hits;
-}
+        if (RegExp.$1) {
+            hits = parseInt(RegExp.$1);
+            expect(hits).toBeGreaterThan(0);
+        }
+
+        //debug("Hits: " + hits);
+        return hits;
+    }
 
 describe("Check pazpar2 search", function () {
     it("pazpar2 was successfully initialize", function () {
@@ -45,10 +46,14 @@ describe("Check pazpar2 search", function () {
         debug("set search query: " + search_query)
         expect($("input#mkwsQuery").val()).toMatch("^" + search_query + "$");
 
-        // wait for service proxy auth
-        waitsFor(function () {
-            return mkws.authenticated;
-        }, "SP auth done", 10 * 1000);
+        if (mkws_config.use_service_proxy) {
+            // wait for service proxy auth
+            waitsFor(function () {
+                return mkws.authenticated;
+            }, "SP auth done", 10 * 1000);
+        } else {
+            debug("running raw pp2, don't wait for mkws auth");
+        }
 
         runs(function () {
             debug("Click on submit button");
@@ -225,6 +230,11 @@ describe("Show record", function () {
     });
 
     it("extract URL", function () {
+        if (mkws_config.jasmine && mkws_config.jasmine.show_record_url == false) {
+            debug("ignore test for URL in record")
+            return;
+        }
+
         var url = $("div#mkwsRecords div.record:nth-child(" + record_number + ") div table tbody tr td a").text();
         debug("extracted URL from record: " + url);
 
@@ -291,7 +301,7 @@ describe("Check status client counter", function () {
 
         }, "wait for Active clients: 0/1", 4 * 1000);
 
-        /*
+/*
         runs(function () {
             var clients = $("div#mkwsStat span.clients");
             debug("span.clients: " + clients.text());

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 95205da..cb3e973 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -421,6 +421,8 @@ function onFormSubmitEventHandler()
 
 function newSearch(query, sort, targets)
 {
+    debug("newSearch: " + query);
+   
     if (mkws_config.use_service_proxy && !mkws.authenticated) {
        alert("searching before authentication");
        return;
@@ -903,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
@@ -931,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');