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

diff --git a/examples/htdocs/auto3.html b/examples/htdocs/auto3.html
index 6f60df0..4fef994 100644 (file)
--- a/examples/htdocs/auto3.html
+++ b/examples/htdocs/auto3.html
@@ -38,7 +38,7 @@
 <div class='mkwsRecords mkwsTeam_plos'
        autosearch='dinosaur'
        sort='relevance'
-       targets='pz:id~lui.indexdata.com:8080/solr4/#6265'
+       targets='pz:id=lui.indexdata.com:8080/solr4/select?fq=database:6265/'
 >PLOS ONE articles will appear here</div>
        </td>
        <td style="background: #e0f8f0">
@@ -46,7 +46,7 @@
 <div class='mkwsRecords mkwsTeam_gutenberg'
        autosearch='dinosaur'
        sort='relevance'
-       targets='pz:id~lui.indexdata.com:8080/solr4/#3552'
+       targets='pz:id=lui.indexdata.com:8080/solr4/select?fq=database:3552/'
 >Free e-books will appear here</div>
        </td>
        <td style="background: #e0f0f8">
@@ -54,7 +54,7 @@
 <div class='mkwsRecords mkwsTeam_blog'
        autosearch='dinosaur'
        sort='relevance'
-       targets='pz:id~lui.indexdata.com:8080/solr4/#5802'
+       targets='pz:id=lui.indexdata.com:8080/solr4/select?fq=database:5802/'
 >Library catalog entries will appear here</div>
        </td>
       </tr>

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 7a98ed8..4ba963c 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -6,6 +6,23 @@
 "use strict"; // HTML5: disable for log_level >= 2
 
 
+// Incredible that the standard JavaScript runtime doesn't define a
+// unique windowId. Instead, we have to make one up. And since there's
+// no global area shared between windows, the best we can do for
+// ensuring uniqueness is generating a random ID and crossing our
+// fingers. We stash this in window.name, as it's the only place to
+// keep data that is preserved across reloads and within-site
+// navigation. pz2.js picks this up and uses it as part of the
+// cookie-name, to ensure each tab gets its own session.
+if (window.name) {
+  console.log("Using existing window.name '" + window.name + "'");
+} else {
+  // Ten chars from 26 alpha-numerics = 36^10 = 3.65e15 combinations.
+  // At one per second, it will take 116 million years to duplicate a session
+  window.name = Math.random().toString(36).slice(2, 12);
+  console.log("Generated new window.name '" + window.name + "'");
+}
+
 // Set up global mkws object. Contains truly global state such as SP
 // authentication, and a hash of team objects, indexed by team-name.
 //
@@ -252,6 +269,14 @@ mkws.defaultTemplate = function(name) {
 {{#if md-title-responsibility}}\
   <span><i>{{md-title-responsibility}}</i></span>\
 {{/if}}\
+{{#if md-date}}, {{md-date}}\
+{{#if location}}\
+, {{#mkws-first location}}{{mkws-attr "@name"}}{{/mkws-first}}\
+{{/if}}\
+{{#if md-medium}}\
+<span>, {{md-medium}}</span>\
+{{/if}}\
+{{/if}}\
 ';
   } else if (name === "Image") {
     return '\

diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index 3761752..85c2ba4 100644 (file)
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -431,7 +431,7 @@ mkws.registerWidgetType('Progress', function() {
         s += '</span>';
         s += '<span class="mkwsWaiting">';
       }
-      s += '&#x2588';
+      s += '&#x2588;';
     }
     s += '</span>';
     that.node.html(s);

diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test
index d47abc7..54813dd 100644 (file)
--- a/tools/apache2/mkws-test
+++ b/tools/apache2/mkws-test
@@ -33,10 +33,14 @@
     RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkws&password=mkws [P]
 
     # jasmine test account
-    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwstest&password=mkwstest [P]
-
-    ProxyPass        /service-proxy/ http://sp-mkc-arya.indexdata.com:8080/service-proxy/
-    ProxyPassReverse /service-proxy/ http://sp-mkc-arya.indexdata.com:8080/service-proxy/
+    RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [P]
+    RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=kohademo&password=kohademo [P]
+    #RewriteRule /service-proxy-kohaauth(/)?(;jsessionid=.+)?  /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [P]
+
+    ProxyPass        /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
+    #ProxyPass        /service-proxy/ http://sp-mkc-arya.indexdata.com:8080/service-proxy/
+    #ProxyPassReverse /service-proxy/ http://sp-mkc-arya.indexdata.com:8080/service-proxy/
     #ProxyPass        /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
     #ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/