From: Mike Taylor <mike@indexdata.com>
Date: Thu, 17 Apr 2014 14:37:09 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~907^2~8^2
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=c1b1bf007c94271da01c0dea9f1e52870deac79d;hp=bb19ccbe939835368fab2f02203684970d9d8fb4;p=mkws-moved-to-github.git

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

diff --git a/examples/htdocs/dict.html b/examples/htdocs/dict.html
index 0520280..9aac803 100644
--- a/examples/htdocs/dict.html
+++ b/examples/htdocs/dict.html
@@ -43,7 +43,7 @@
     </tr>
   </table>
     <script type="text/javascript">
-      $("#mkwsSearch").hide();
+      $(".mkwsSearch").hide();
 
       document.onclick = clickfunc;
       var selectedtext="";
diff --git a/examples/htdocs/index.html b/examples/htdocs/index.html
index e58c1de..981d83c 100644
--- a/examples/htdocs/index.html
+++ b/examples/htdocs/index.html
@@ -12,5 +12,6 @@
     <div class="mkwsResults"></div>
     <div class="mkwsTargets"></div>
     <div class="mkwsStat"></div>
+    <div class="mkwsBuilder"></div>
   </body>
 </html>
diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 88763a2..9bbe36f 100644
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -47,7 +47,7 @@
     jQuery.pazpar2({
         "layout": "popup",               /* "table" [default], "div", "popup" */
         "id_button": "input.mkwsButton", /* submit button id in search field */
-        "id_popup": "#mkwsPopup",        /* internal id of popup window */
+        "id_popup": ".mkwsPopup",        /* internal id of popup window */
         "width": 990,                    /* popup width, should be at least 800 */
         "height": 760                    /* popup height, should be at least 600 */
     });
diff --git a/examples/htdocs/jasmine-pp2.html b/examples/htdocs/jasmine-pp2.html
index b4e858c..60aa55f 100644
--- a/examples/htdocs/jasmine-pp2.html
+++ b/examples/htdocs/jasmine-pp2.html
@@ -22,12 +22,12 @@
 
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <style type="text/css">
-      #mkwsTermlists div.facet {
+      .mkwsTermlists div.facet {
       float:left;
       width: 30%;
       margin: 0.3em;
       }
-      #mkwsStat {
+      .mkwsStat {
       text-align: right;
       }
     </style>
diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html
index bbbae07..66183f1 100644
--- a/examples/htdocs/jasmine.html
+++ b/examples/htdocs/jasmine.html
@@ -16,12 +16,12 @@
     <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
     <script type="text/javascript" src="src/mkws.js"></script>
     <style type="text/css">
-      #mkwsTermlists div.facet {
+      .mkwsTermlists div.facet {
       float:left;
       width: 30%;
       margin: 0.3em;
       }
-      #mkwsStat {
+      .mkwsStat {
       text-align: right;
       }
     </style>
diff --git a/examples/htdocs/lowlevel.html b/examples/htdocs/lowlevel.html
index 2357b55..f8b417f 100644
--- a/examples/htdocs/lowlevel.html
+++ b/examples/htdocs/lowlevel.html
@@ -5,12 +5,12 @@
     <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
     <style type="text/css">
-      #mkwsTermlists div.facet {
+      .mkwsTermlists div.facet {
       float:left;
       width: 30%;
       margin: 0.3em;
       }
-      #mkwsStat {
+      .mkwsStat {
       text-align: right;
       }
     </style>
diff --git a/examples/htdocs/wolfram.html b/examples/htdocs/wolfram.html
index ee8f2e7..bde7338 100644
--- a/examples/htdocs/wolfram.html
+++ b/examples/htdocs/wolfram.html
@@ -16,10 +16,11 @@
 	  service_proxy_auth : "/service-proxy-testauth"
       };
     </script>
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="src/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="src/pz2.js"></script>
+    <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
+   
     <!-- <script type="text/javascript" src="src/mkws.js"></script> -->
     <script type="text/javascript" src="src/mkws-handlebars.js"></script>
     <script type="text/javascript" src="src/mkws-core.js"></script>
@@ -31,12 +32,12 @@
     <script type="text/javascript" src="src/mkws-widget-record.js"></script>
 
     <style type="text/css">
-      #mkwsTermlists div.facet {
+      .mkwsTermlists div.facet {
       float:left;
       width: 30%;
       margin: 0.3em;
       }
-      #mkwsStat {
+      .mkwsStat {
       text-align: right;
       }
     </style>
diff --git a/examples/htdocs/wolfram2.html b/examples/htdocs/wolfram2.html
index 75978f5..277342e 100644
--- a/examples/htdocs/wolfram2.html
+++ b/examples/htdocs/wolfram2.html
@@ -6,12 +6,12 @@
     <title>MKWS demo: Wolfram's playground</title>
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <style type="text/css">
-      #mkwsTermlists div.facet {
+      .mkwsTermlists div.facet {
       float:left;
       width: 30%;
       margin: 0.3em;
       }
-      #mkwsStat {
+      .mkwsStat {
       text-align: right;
       }
     </style>
@@ -50,7 +50,7 @@
       </tr>
     </table>
 
-    <script type="text/javascript" src="tools/htdocs/mkws-complete.js"></script>
+    <script type="text/javascript" src="src/mkws-complete.js"></script>
     <!-- <script type="text/javascript" src="https://mkws.indexdata.com/mkws-complete.js"></script> -->
 
     <script type="text/javascript">
diff --git a/src/mkws-jquery.js b/src/mkws-jquery.js
index 0756d54..2f79db4 100644
--- a/src/mkws-jquery.js
+++ b/src/mkws-jquery.js
@@ -20,7 +20,7 @@ function _mkws_jquery_plugin($) {
 	var height = config.height || 760;
 	var width = config.width || 880;
 	var id_button = config.id_button || "input.mkwsButton";
-	var id_popup = config.id_popup || "#mkwsPopup";
+	var id_popup = config.id_popup || ".mkwsPopup";
 
 	debug("popup height: " + height + ", width: " + width);
 
@@ -57,30 +57,30 @@ function _mkws_jquery_plugin($) {
 
 	// service-proxy or pazpar2
 	pazpar2: function(config) {
-	    if (config == null || typeof config != 'object') { 
+	    if (config == null || typeof config != 'object') {
 		config = {};
 	    }
-	    var id_popup = config.id_popup || "#mkwsPopup";
-	    id_popup = id_popup.replace(/^#/, "");
+	    var id_popup = config.id_popup || ".mkwsPopup";
+	    id_popup = id_popup.replace(/^[#\.]/, "");
 
 	    // simple layout
 	    var div = '\
-<div id="mkwsSwitch"></div>\
-<div id="mkwsLang"></div>\
-<div id="mkwsSearch"></div>\
-<div id="mkwsResults"></div>\
-<div id="mkwsTargets"></div>\
-<div id="mkwsStat"></div>';
+<div class="mkwsSwitch"></div>\
+<div class="mkwsLang"></div>\
+<div class="mkwsSearch"></div>\
+<div class="mkwsResults"></div>\
+<div class="mkwsTargets"></div>\
+<div class="mkwsStat"></div>';
 
 	    // new table layout
 	    var table = '\
 <style type="text/css">\
-  #mkwsTermlists div.facet {\
+  .mkwsTermlists div.facet {\
   float:left;\
   width: 30%;\
   margin: 0.3em;\
   }\
-  #mkwsStat {\
+  .mkwsStat {\
   text-align: right;\
   }\
 </style>\
@@ -88,44 +88,44 @@ function _mkws_jquery_plugin($) {
 <table width="100%" border="0">\
   <tr>\
     <td>\
-      <div id="mkwsSwitch"></div>\
-      <div id="mkwsLang"></div>\
-      <div id="mkwsSearch"></div>\
+      <div class="mkwsSwitch"></div>\
+      <div class="mkwsLang"></div>\
+      <div class="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 class="mkwsPager"></div>\
+	<div class="mkwsNavi"></div>\
+	<div class="mkwsRecords"></div>\
+	<div class="mkwsTargets"></div>\
+	<div class="mkwsRanking"></div>\
       </div>\
     </td>\
   </tr>\
   <tr>\
     <td>\
       <div style="height:300px; overflow: hidden">\
-	<div id="mkwsTermlists"></div>\
+	<div class="mkwsTermlists"></div>\
       </div>\
     </td>\
   </tr>\
   <tr>\
     <td>\
-      <div id="mkwsStat"></div>\
+      <div class="mkwsStat"></div>\
     </td>\
   </tr>\
 </table>';
 
 	    var popup = '\
-<div id="mkwsSearch"></div>\
-<div id="' + id_popup + '">\
-  <div id="mkwsSwitch"></div>\
-  <div id="mkwsLang"></div>\
-  <div id="mkwsResults"></div>\
-  <div id="mkwsTargets"></div>\
-  <div id="mkwsStat"></div>\
+<div class="mkwsSearch"></div>\
+<div class="' + id_popup + '">\
+  <div class="mkwsSwitch"></div>\
+  <div class="mkwsLang"></div>\
+  <div class="mkwsResults"></div>\
+  <div class="mkwsTargets"></div>\
+  <div class="mkwsStat"></div>\
 </div>'
 
 	    if (config && config.layout == 'div') {
diff --git a/test/.gitignore b/test/.gitignore
index 3c3629e..1e39bc5 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1 +1,6 @@
 node_modules
+logs/error_log
+logs/jasmine-dev
+logs/mkws-jasmine-access.log
+logs/mkws-jasmine-error.log
+logs/mkws-jasmine-rewrite.log
diff --git a/test/Makefile b/test/Makefile
index 125efa7..8547d4e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -32,7 +32,7 @@ clean-error:
 clean-tmp:
 	rm -rf ${TMP_DIR}
 	mkdir -p ${TMP_DIR}
-	touch ${TMP_DIR}/.gitignore
+	touch ${TMP_DIR}/.gitkeep
 
 mkws-complete-syntax-check:
 	${MAKE} -C../src mkws-complete.min.js
diff --git a/test/logs/.gitignore b/test/logs/.gitignore
deleted file mode 100644
index e0cbaa1..0000000
--- a/test/logs/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-error_log
-jasmine-dev
-mkws-jasmine-access.log
-mkws-jasmine-error.log
-mkws-jasmine-rewrite.log
diff --git a/test/logs/.gitkeep b/test/logs/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 483bac7..9ae28d3 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -285,13 +285,13 @@ describe("Check Author Facets", function () {
 describe("Check active clients author", function () {
     it("check for active clients after limited author search", function () {
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             //debug("clients: " + clients.text());
             return clients.length == 1 && clients.text().match("/[1-9]+[0-9]+$");
         }, "wait for Active clients: x/y", 5 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("/[1-9]+[0-9]+$");
 
@@ -385,13 +385,13 @@ describe("Check record list", function () {
         }
 
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             //debug("clients: " + clients.text());
             return clients.length == 1 && clients.text().match("/1$");
         }, "wait for Active clients: x/1", 5 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("/1$");
         });
@@ -501,7 +501,7 @@ describe("Check status client counter", function () {
         }
 
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("clients: " + clients.text());
             if (clients.length == 1 && clients.text().match("0/1$")) {
                 return true;
@@ -511,7 +511,7 @@ describe("Check status client counter", function () {
         }, "wait for Active clients: 0/1", 4 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("0/1$");
         });
diff --git a/tools/apache2/mkws-ne b/tools/apache2/mkws-ne
new file mode 100644
index 0000000..c0ade2a
--- /dev/null
+++ b/tools/apache2/mkws-ne
@@ -0,0 +1,45 @@
+# Configuration for the apache web server                 -*- apache -*-
+
+# pazpar2 / service proxy config
+<VirtualHost *:80>
+    ServerName mkws-ne
+    ServerAlias mkws-ne
+
+    ServerAdmin webmaster@indexdata.com
+    ErrorLog /var/log/apache2/mkws-dev-error.log
+    CustomLog /var/log/apache2/mkws-dev-access.log combined
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/mkws-dev-rewrite.log
+
+    DocumentRoot /indexdata/gitprojects/mkws/examples/htdocs
+    #Alias /tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
+    #Alias /src /home/indexdata/mkws-dev/src
+    #Alias /test /home/indexdata/mkws-dev/test
+    #Alias /jasmine /home/indexdata/mkws-dev/examples/jasmine
+
+    # CORS setting
+    #Header set Access-Control-Allow-Credentials true
+    #Headers set Access-Control-Allow-Origin "*"
+
+    # compress text output
+    <Location />
+        AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml
+        SetOutputFilter DEFLATE
+    </Location>
+
+    # jasmine test account
+    RewriteRule /service-proxy-testauth  /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
+
+    # mkws devel account (e.g. memached testing)
+    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,P]
+
+    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+
+    ProxyPass        /pazpar2/         http://mk2-test.indexdata.com/test-pazpar2/
+    ProxyPassReverse /pazpar2/         http://mk2-test.indexdata.com/test-pazpar2/
+
+</VirtualHost>
+