Merge branch 'master' into bug_4688

diff --git a/etc/.gitignore b/etc/.gitignore
index 017796c..23669ea 100644 (file)
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1 +1,2 @@
 pazpar2.cfg
+pz22usi.xsl

diff --git a/etc/cf.xsl b/etc/cf.xsl
index ec4615f..49eb5e0 100644 (file)
--- a/etc/cf.xsl
+++ b/etc/cf.xsl
@@ -16,6 +16,13 @@
 
   <xsl:param name="medium" />
 
+  <!--
+    According to cf/builder/templates/parseTask.cff, connectors can
+    also generate a "medium" field, but that is ignored in this
+    stylesheet, the rule below instead using an XSLT parameter.
+    Should the data element be used in preference when it is included?
+  -->
+
   <xsl:template match="/record">
     <pz:record>
       <pz:metadata type="medium">
@@ -121,6 +128,13 @@
     </pz:metadata>
   </xsl:template>
 
+  <!--
+    According to cf/builder/templates/parseTask.cff, connectors can
+    also generate a "holding" field, but it's not clear how that is
+    different from "item".  Perhaps this "item" rule should also
+    handle "holding" in the same way?
+  -->
+
   <xsl:template match="item">
     <pz:metadata type="locallocation">
       <xsl:choose>
@@ -192,6 +206,84 @@
     </pz:metadata>
   </xsl:template>
 
+  <xsl:template match="available">
+    <pz:metadata type="available">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="citation">
+    <pz:metadata type="citation">
+      <xsl:value-of select="."/>
+      </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="relevance">
+    <pz:metadata type="relevance">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="booktitle">
+    <pz:metadata type="booktitle">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="copyright">
+    <pz:metadata type="copyright">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="copyrightabstract">
+    <pz:metadata type="copyrightabstract">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="pubtype">
+    <pz:metadata type="pubtype">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="doctype">
+    <pz:metadata type="doctype">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="extent">
+    <pz:metadata type="extent">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="format">
+    <pz:metadata type="format">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="languageitem">
+    <pz:metadata type="languageitem">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="languageabstract">
+    <pz:metadata type="languageabstract">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="permalink">
+    <pz:metadata type="permalink">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
   <xsl:template match="text()"/>
 
 </xsl:stylesheet>

diff --git a/m4 b/m4
index 96ff03f..eda6995 160000 (submodule)
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit 96ff03f91b4539e315dadd50ab2564412c076394
+Subproject commit eda6995523f2412995ee60b5fe6443dee3e0d156

diff --git a/www/iphone/example_client.js b/www/iphone/example_client.js
index fb42b3f..18feaa9 100644 (file)
--- a/www/iphone/example_client.js
+++ b/www/iphone/example_client.js
@@ -57,7 +57,7 @@ function loginFormSubmit() {
        authCb, authCb);
 }
 
-function handleKeyPress(e, formId, focusId)  
+function handleKeyPress(e)  
 {  
   var key;  
   if(window.event)  
@@ -67,10 +67,10 @@ function handleKeyPress(e, formId, focusId)
 
   if(key == 13 || key == 10)  
   {  
-      onFormSubmitEventHandler();
-      focusElement = document.getElementById(focusId);
-      if (focusElement)
-         focusElement.focus();  
+      button = document.getElementById('button');
+      button.focus();
+      button.click();
+
       return false;  
   }  
   else  

diff --git a/www/iphone/go.html b/www/iphone/go.html
index 1fd9880..678e2b0 100644 (file)
--- a/www/iphone/go.html
+++ b/www/iphone/go.html
@@ -15,8 +15,12 @@
   
     if(key == 13 || key == 10)  
     {  
-      document.forms[0].submit()  
-      document.getElementById('testLink').focus();  
+      //document.forms[0].submit();
+      button = document.getElementById('button');
+      button.focus();
+      button.click();
+  
+  
       return false;  
     }  
     else  
@@ -30,7 +34,8 @@
          onKeyPress="return handleKeyPress(event)"  
           maxlength="100"  
                    value="" />  
+      <input id="button" type="submit" value="go" />
       <a href="#" id="testLink"></a>  
     </form>  
   </body>  
-</html>  
\ No newline at end of file
+</html>  

diff --git a/www/iphone/index.html b/www/iphone/index.html
index dd565de..c12bac1 100644 (file)
--- a/www/iphone/index.html
+++ b/www/iphone/index.html
@@ -55,7 +55,7 @@
 -->
      <td width="100%">
       <form id="searchForm" name="search" style="display: none">
-       <input id="query" type="text" onKeyPress="return handleKeyPress(event, 'searchForm')" />
+       <input id="query" type="text" onKeyPress="return handleKeyPress(event)" />
        <input id="button" type="submit" value="go" /><a id="hidden" href=""></a>
       </form>
      </td>