projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: e649f5b)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 13 Jun 2013 15:45:35 +0000 (16:45 +0100)
committerMike Taylor <mike@indexdata.com>
Thu, 13 Jun 2013 15:45:35 +0000 (16:45 +0100)
etc/apache2/spdemo patch | blob | history
etc/apache2/spdemo-px patch | blob | history
experiments/spdemo/example_client.js patch | blob | history
experiments/spdemo/index.html patch | blob | history

diff --git a/etc/apache2/spdemo b/etc/apache2/spdemo
index 13c3841..cc187be 100644 (file)
--- a/etc/apache2/spdemo
+++ b/etc/apache2/spdemo
@@ -3,7 +3,7 @@
 # pazpar2 / service proxy config
 <VirtualHost *:80>
     ServerName spdemo.example.com
-    ServerAlias spdemo-test.indexdata.com spdemo-dev.indexdata.com spdemo-devel.indexdata.com
+    ServerAlias spdemo-dev.indexdata.com spdemo-devel.indexdata.com spdemo-sp.indexdata.com spdemo-pp2.indexdata.com 
     ServerAdmin webmaster@example.com
     ErrorLog /var/log/apache2/spdemo-error.log
     CustomLog /var/log/apache2/spdemo-access.log combined
diff --git a/etc/apache2/spdemo-px b/etc/apache2/spdemo-px
index 1d6cd6a..77f8f67 100644 (file)
--- a/etc/apache2/spdemo-px
+++ b/etc/apache2/spdemo-px
@@ -1,6 +1,6 @@
 <VirtualHost *:80> 
    ServerName spdemo.indexdata.com
-   ServerAlias spdemo-test.indexdata.com spdemo-dev.indexdata.com spdemo-devel.indexdata.com
+   ServerAlias spdemo-dev.indexdata.com spdemo-devel.indexdata.com spdemo-sp.indexdata.com spdemo-pp2.indexdata.com
    
    ErrorLog /var/log/apache2/spdemo-error.log
    CustomLog /var/log/apache2/spdemo-access.log combined
@@ -15,7 +15,7 @@
      Allow from all
    </Proxy>
 
-   ProxyPass         / http://dart:80/
-   ProxyPassReverse  / http://dart:80/
+   ProxyPass         / http://spdemo/
+   ProxyPassReverse  / http://spdemo/
 </VirtualHost>
 
diff --git a/experiments/spdemo/example_client.js b/experiments/spdemo/example_client.js
index 8342494..a8b9a9a 100644 (file)
--- a/experiments/spdemo/example_client.js
+++ b/experiments/spdemo/example_client.js
@@ -4,14 +4,23 @@
 // create a parameters array and pass it to the pz2's constructor
 // then register the form submit event with the pz2.search function
 // autoInit is set to true on default
-var usesessions = true;
-var pazpar2path = '/pazpar2/search.pz2';
+
+var pazpar2URL = "/pazpar2/search.pz2";
+var serviceProxyURL = "/service-proxy/";
+var authURLServiceProxy = "/service-proxy-auth";
+var pazpar2path = useServiceProxy ? serviceProxyURL : pazpar2URL;
+
+var usesessions;
+
 var showResponseType = '';
 if (document.location.hash == '#useproxy') {
     usesessions = false;
     pazpar2path = '/service-proxy/';
     showResponseType = 'json';
 }
+if (useServiceProxy) {
+    usesessions = false;
+}
 
 var my_paz = new pz2( { "onshow": my_onshow,
                     "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
@@ -89,7 +98,10 @@ function my_onstat(data) {
                         + data.activeclients
                         + '/' + data.clients + ' -- </span>'
                         + '<span>Retrieved records: ' + data.records
-                        + '/' + data.hits + ' :.</span>';
+                        + '/' + data.hits
+                       + ' -- by ' 
+                       + (useServiceProxy ? 'service proxy' : 'pazpar2')
+                       + ' :.</span>';
 }
 
 function my_onterm(data) {
diff --git a/experiments/spdemo/index.html b/experiments/spdemo/index.html
index 208b35e..6d8f610 100644 (file)
--- a/experiments/spdemo/index.html
+++ b/experiments/spdemo/index.html
@@ -7,8 +7,20 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>Pazpar2 demo client</title>
   <link rel="stylesheet" href="styles.css"></link>
+  <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+
+  <!-- pre configure -->
+  <script type="text/javascript">
+    var useServiceProxy = true;
+  </script>
+
   <script type="text/javascript" src="pz2.js"></script>
   <script type="text/javascript" src="example_client.js"></script>
+
+  <!-- post configure -->
+  <script type="text/javascript">
+    $(document).ready(function() { if (useServiceProxy) jQuery.get(authURLServiceProxy) } );
+  </script>
  </head>
  
  <body onload="domReady();">
@@ -87,7 +99,7 @@
   
   <div id="footer">
       <div id="stat"></div>
-      <span>Copyright &copy; 1999-2010 by <a href="http://www.indexdata.com">Index Data</a></span> 
+      <span>Copyright &copy; 1999-2013 by <a href="http://www.indexdata.com">Index Data</a></span> 
   </div>
 
  </body>
MasterKey Widget Set