From: Wolfram Schneider Date: Wed, 18 Dec 2013 14:15:07 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws X-Git-Tag: 0.9.1~34 X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=1fd20fb02019b453808dc4abf2773bd3940b705c;hp=76e2d3b64d6825313dfb120d387ceb43da169535 Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws --- diff --git a/examples/htdocs/wolfram2.html b/examples/htdocs/wolfram2.html new file mode 100644 index 0000000..84efba2 --- /dev/null +++ b/examples/htdocs/wolfram2.html @@ -0,0 +1,62 @@ + + + + + + MKWS demo: Wolfram's playground + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js index 77d9ba3..89c1ef6 100644 --- a/test/spec/mkws-pazpar2.js +++ b/test/spec/mkws-pazpar2.js @@ -4,27 +4,28 @@ * */ -var debug_level = mkws.debug_level; -var debug = mkws.debug_function; +// get references from mkws.js, lazy evaluation +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); - } - - //debug("Hits: " + hits); - return hits; + // 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); } + //debug("Hits: " + hits); + return hits; +} + describe("Check pazpar2 search", function () { it("pazpar2 was successfully initialize", function () { expect(mkws_config.error).toBe(undefined);