projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 76e2d3b)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 18 Dec 2013 14:15:07 +0000 (14:15 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 18 Dec 2013 14:15:07 +0000 (14:15 +0000)
examples/htdocs/wolfram2.html [new file with mode: 0644] patch | blob
test/spec/mkws-pazpar2.js patch | blob | history

diff --git a/examples/htdocs/wolfram2.html b/examples/htdocs/wolfram2.html
new file mode 100644 (file)
index 0000000..84efba2
--- /dev/null
+++ b/examples/htdocs/wolfram2.html
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo: Wolfram's playground</title>
+    <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
+    <script type="text/javascript">
+      var mkws_config = {
+       /*
+         pazpar2_url : "/service-proxy/",
+         service_proxy_auth : "/service-proxy-auth/",
+         */
+      };
+    </script>
+    <script type="text/javascript" src="../../tools/htdocs/mkws-complete.js"></script>
+    <style type="text/css">
+      #mkwsTermlists div.facet {
+      float:left;
+      width: 30%;
+      margin: 0.3em;
+      }
+      #mkwsStat {
+      text-align: right;
+      }
+    </style>
+  </head>
+  <body>
+    <table width="100%" border="0">
+      <tr>
+        <td>
+         <div id="mkwsSwitch"></div>
+          <div id="mkwsLang"></div>
+          <div id="mkwsSearch"></div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div style="height:500px; overflow: auto">
+            <div id="mkwsPager"></div>
+            <div id="mkwsNavi"></div>
+            <div id="mkwsRecords"></div>
+            <div id="mkwsTargets"></div>
+            <div id="mkwsRanking"></div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div style="height:300px; overflow: hidden">
+            <div id="mkwsTermlists"></div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div id="mkwsStat"></div>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 77d9ba3..89c1ef6 100644 (file)
--- 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);
MasterKey Widget Set