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 ced0a8c..66a03f3 100644 (file)
--- a/examples/htdocs/jasmine-pp2.html
+++ b/examples/htdocs/jasmine-pp2.html
@@ -5,6 +5,7 @@
     <script type="text/javascript">
       var mkws_config = {
          use_service_proxy: false,
+         disable_facet_authors_search: true, // does not work with raw pazpar2
          pazpar2_url : "/pazpar2/",
          perpage_default: 10
       };

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 60483cd..7900190 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -208,6 +208,11 @@ describe("Check Termlist", function () {
     });
 
     it("limit search to first author", function () {
+        if (mkws_config.disable_facet_authors_search) {
+            debug("Facets: ignore limit search for authors");
+            return;
+        }
+
         var hits_all_targets = get_hit_counter();
         var author_number = 2; // 2=first author
         // do not click on author with numbers, e.g.: "Bower, James M. Beeman, David, 1938-"

diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index 0c912f1..30f2727 100644 (file)
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -3,7 +3,7 @@
 # pazpar2 / service proxy config
 <VirtualHost *:80>
     ServerName mkws-dev.indexdata.com
-    ServerAlias mkws-dev a.mkws.indexdata.com
+    ServerAlias mkws-dev a.mkws.indexdata.com a.mkws-dev.indexdata.com
 
     ServerAdmin webmaster@indexdata.com
     ErrorLog /var/log/apache2/mkws-dev-error.log