Resolve: it seems Wolfram and I both independently added an examples/htdocs/Makefile...

diff --git a/examples/htdocs/Makefile b/examples/htdocs/Makefile
index b076114..0441bb8 100644 (file)
--- a/examples/htdocs/Makefile
+++ b/examples/htdocs/Makefile
@@ -1,10 +1,20 @@
-all: apache-config.txt
+# Copyright (c) 2013 IndexData ApS. http://indexdata.com
+
+all: apache-config.txt jasmine-links
 
 apache-config.txt: ../apache2/mkws-examples-mike
        rm -f $@
        cp -p $< $@
        chmod ugo-w $@
 
-clean:
+jasmine-links:
+       ln -fs ../../../jasmine .
+       ln -fs ../../test .
+
+help:
+       @echo "make [ all | clean | jasmine-links ]"
+
+clean distclean:
        rm -f apache-config.txt
+       rm -rf test jasmine
 

diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index ce73d12..d497361 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -8,7 +8,7 @@
 
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="http://mkws.indexdata.com/pazpar2/js/pz2.js"></script>
-    <script type="text/javascript" src="http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars.runtime-v1.1.2.js"></script>
+    <script type="text/javascript" src="../../tools/htdocs/handlebars-v1.1.2.js"></script>
     <script type="text/javascript" src="../../tools/htdocs/mkws.js"></script>
     <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
 

diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html
index e27575a..23f5e09 100644 (file)
--- a/examples/htdocs/jasmine.html
+++ b/examples/htdocs/jasmine.html
@@ -13,7 +13,7 @@
     </script>
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
     <script type="text/javascript" src="http://mkws.indexdata.com/pazpar2/js/pz2.js"></script>
-    <script type="text/javascript" src="http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars.runtime-v1.1.2.js"></script>
+    <script type="text/javascript" src="../../tools/htdocs/handlebars-v1.1.2.js"></script>
     <script type="text/javascript" src="../../tools/htdocs/mkws.js"></script>
     <style type="text/css">
       #mkwsTermlists div.facet {

diff --git a/examples/htdocs/wolfram.html b/examples/htdocs/wolfram.html
index 83b9040..d7f4786 100644 (file)
--- a/examples/htdocs/wolfram.html
+++ b/examples/htdocs/wolfram.html
@@ -15,7 +15,7 @@
     </script>
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.4.4.min.js"></script>
     <script type="text/javascript" src="http://mkws.indexdata.com/pazpar2/js/pz2.js"></script>
-    <script type="text/javascript" src="http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars.runtime-v1.1.2.js"></script>
+    <script type="text/javascript" src="../../tools/htdocs/handlebars-v1.1.2.js"></script>
     <script type="text/javascript" src="../../tools/htdocs/mkws.js"></script>
     <style type="text/css">
       #mkwsTermlists div.facet {

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 942fb53..06447f6 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -46,7 +46,7 @@ describe("Check pazpar2 search", function () {
 
         // wait for service proxy auth
         waitsFor(function () {
-            return mkws.service_proxy_auth;
+            return mkws.authenticated;
         }, "SP auth done", 10 * 1000);
 
         runs(function () {

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index e0a5498..13a0e5c 100644 (file)
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -51,7 +51,8 @@ mkws-js ${MKWS_JS}: mkws.js handlebars-v1.1.2.js
          echo "*/"; \
          curl -sSf ${JQUERY_URL} | perl -npe 's,sourceMappingURL=jquery.*map,,'; \
          cat handlebars-v1.1.2.js; \
-         cat ${PZ2API_JS} mkws.js ) > ${MKWS_JS}.new 
+         cat ${PZ2API_JS}; \
+         cat  mkws.js ) > ${MKWS_JS}.new 
        mv -f ${MKWS_JS}.new ${MKWS_JS}
 
 handlebars-v1.1.2.js:

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 281f5b2..a14a0cc 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -196,6 +196,9 @@ Handlebars.registerHelper('commaList', function(items, options) {
 mkws.sort = mkws_config.sort_default;
 debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to mkws.sort");
 
+mkws.pazpar2path = mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/";
+mkws.usesessions = mkws_config.use_service_proxy ? false : true;
+
 if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
     debug("Reset query width: " + mkws_config.query_width);
     mkws_config.query_width = 50;
@@ -218,13 +221,13 @@ for (var key in mkws_config) {
 // autoInit is set to true on default
 var my_paz = new pz2( { "onshow": my_onshow,
                     "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
-                    "pazpar2path": mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/",
+                    "pazpar2path": mkws.pazpar2path,
                     "oninit": my_oninit,
                     "onstat": my_onstat,
                     "onterm": my_onterm,
                     "termlist": "xtargets,subject,author",
                     "onbytarget": my_onbytarget,
-                   "usesessions" : mkws_config.use_service_proxy ? false : true,
+                   "usesessions" : mkws.usesessions,
                     "showResponseType": '', // or "json" (for debugging?)
                     "onrecord": my_onrecord } );
 
@@ -523,7 +526,7 @@ mkws.limitTarget  = function (id, name)
 
 mkws.delimitQuery = function (field, value)
 {
-    debug("delimitQuery(field=" + field + ", value=" + value + ")");    
+    debug("delimitQuery(field=" + field + ", value=" + value + ")");
     var newFilters = [];
     for (var i in mkws.filters) {
        var filter = mkws.filters[i];
@@ -548,7 +551,7 @@ mkws.delimitQuery = function (field, value)
 
 mkws.delimitTarget = function (id)
 {
-    debug("delimitTarget(id=" + id + ")");    
+    debug("delimitTarget(id=" + id + ")");
     var newFilters = [];
     for (var i in mkws.filters) {
        var filter = mkws.filters[i];
@@ -589,7 +592,7 @@ function redraw_navi ()
                ');return false;">' + filter.value + '</a>';
        }
     }
-    
+
     navi.innerHTML = text;
 }
 
@@ -902,7 +905,7 @@ function mkws_html_all() {
     mkws_html_switch();
 
     if (mkws_config.use_service_proxy)
-         mkws_service_proxy_auth(mkws_config.service_proxy_auth, 
+         mkws_service_proxy_auth(mkws_config.service_proxy_auth,
           mkws_config.service_proxy_auth_domain);
 
     if (mkws_config.responsive_design_width) {