X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=etc%2Ftmarc.xsl;h=95e99756b0b4470093dae8a20fb0f67abc452426;hb=77fc683f33da2f7679d0372d9cd32a111baedfc6;hp=1ee1200eae3731736d8416943f3ebdb5bd179778;hpb=2a805ec4c390609a26bc584bc9979d94a1096934;p=pazpar2-moved-to-github.git

diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl
index 1ee1200..95e9975 100644
--- a/etc/tmarc.xsl
+++ b/etc/tmarc.xsl
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:pz="http://www.indexdata.com/pazpar2/1.0"
+  xmlns="http://www.indexdata.com/turbomarc"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  xmlns:pz="http://www.indexdata.com/pazpar2/1.0"
   xmlns:tmarc="http://www.indexdata.com/turbomarc">
 
   <xsl:output indent="yes" method="xml" version="1.0"
@@ -95,9 +97,6 @@
 	    ($typeofserial='d' or $typeofserial='w')">web</xsl:when>
 	<xsl:when test="$typeofrec='a' and $biblevel='b'">article</xsl:when>
 	<xsl:when test="$typeofrec='m'">electronic</xsl:when>
-        <xsl:when test="$title_medium">
-          <xsl:value-of select="translate($title_medium, ' []/:', '')" />
-        </xsl:when>
         <xsl:otherwise>
           <xsl:text>other</xsl:text>
         </xsl:otherwise>
@@ -167,34 +166,44 @@
         </pz:metadata>
       </xsl:for-each>
 
-      <pz:metadata type="oclc-number">
-        <xsl:value-of select="$oclc_number" />
-      </pz:metadata>
+      <xsl:if test="string-length($oclc_number) &gt; 0">
+	<pz:metadata type="oclc-number">
+	  <xsl:value-of select="$oclc_number" />
+	</pz:metadata>
+      </xsl:if>
 
       <xsl:for-each select="tmarc:d010">
-        <pz:metadata type="lccn">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="lccn">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d020">
-        <pz:metadata type="isbn">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="isbn">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d022">
-        <pz:metadata type="issn">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="issn">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
-
+      
       <xsl:for-each select="tmarc:d027">
-        <pz:metadata type="tech-rep-nr">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="tech-rep-nr">
+	    <xsl:value-of select="tmarc:sa" />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
-
+      
       <xsl:for-each select="tmarc:d035"> 
         <pz:metadata type="system-control-nr">
           <xsl:choose>
@@ -209,48 +218,68 @@
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d100">
-        <pz:metadata type="author">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="author-title">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
-        <pz:metadata type="author-date">
-          <xsl:value-of select="tmarc:sd" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="author">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sc">
+	  <pz:metadata type="author-title">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sd">
+	  <pz:metadata type="author-date">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d110">
-        <pz:metadata type="corporate-name">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="corporate-location">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
-        <pz:metadata type="corporate-date">
-          <xsl:value-of select="tmarc:sd" />
-        </pz:metadata>
-      </xsl:for-each>
-
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="corporate-name">
+          <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sc">
+	  <pz:metadata type="corporate-location">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sd">
+	  <pz:metadata type="corporate-date">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+      </xsl:for-each>
+      
       <xsl:for-each select="tmarc:d111">
-        <pz:metadata type="meeting-name">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="meeting-location">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
-        <pz:metadata type="meeting-date">
-          <xsl:value-of select="tmarc:sd" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="meeting-name">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sc">
+	  <pz:metadata type="meeting-location">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sd">
+	  <pz:metadata type="meeting-date">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d260">
-        <pz:metadata type="date">
-          <xsl:value-of select="translate(tmarc:sc, 'cp[].', '')" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sc">
+	  <pz:metadata type="date">
+	    <xsl:value-of select="translate(., 'cp[].', '')" />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
 
-      <xsl:if test="$date_008 and not(tmarc:d260)">
+      <xsl:if test="string-length($date_008) &gt; 0 and not(tmarc:d260)">
         <pz:metadata type="date">
           <xsl:choose>
             <xsl:when test="$date_end_008">
@@ -263,96 +292,143 @@
         </pz:metadata>
       </xsl:if>
 
-
       <xsl:for-each select="tmarc:d130">
-        <pz:metadata type="title-uniform">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-media">
-          <xsl:value-of select="tmarc:sm" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-parts">
-          <xsl:value-of select="tmarc:sn" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-partname">
-          <xsl:value-of select="tmarc:sp" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-key">
-          <xsl:value-of select="tmarc:sr" />
-        </pz:metadata>
-      </xsl:for-each>
-
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="title-uniform">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sm">
+	  <pz:metadata type="title-uniform-media">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sn">
+	  <pz:metadata type="title-uniform-parts">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sp">
+	  <pz:metadata type="title-uniform-partname">
+	    <xsl:value-of select="." />	    
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sr">
+	  <pz:metadata type="title-uniform-key">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+      </xsl:for-each>
+      
       <xsl:for-each select="tmarc:d245">
-        <pz:metadata type="title">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="title-remainder">
-          <xsl:value-of select="tmarc:sb" />
-        </pz:metadata>
-        <pz:metadata type="title-responsibility">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
-        <pz:metadata type="title-dates">
-          <xsl:value-of select="tmarc:sf" />
-        </pz:metadata>
-        <pz:metadata type="title-medium">
-          <xsl:value-of select="tmarc:sh" />
-        </pz:metadata>
-        <pz:metadata type="title-number-section">
-          <xsl:value-of select="tmarc:sn" />
-        </pz:metadata>
-        <pz:metadata type="title-complete">
-          <xsl:value-of select="tmarc:sa" />
-          <xsl:if test="tmarc:sb" ><xsl:value-of select="concat(' ', tmarc:sb)" /></xsl:if>
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="title">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sb">
+	  <pz:metadata type="title-remainder">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sc">
+	  <pz:metadata type="title-responsibility">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sf">
+	  <pz:metadata type="title-dates">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sh">
+	  <pz:metadata type="title-medium">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sn">
+	  <pz:metadata type="title-number-section">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:if test="tmarc:sa">
+	  <pz:metadata type="title-complete">
+	    <xsl:value-of select="tmarc:sa" />
+	    <xsl:if test="tmarc:sb" ><xsl:value-of select="concat(' ', tmarc:sb)" /></xsl:if>
+	  </pz:metadata>
+	</xsl:if>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d250">
-        <pz:metadata type="edition">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="edition">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d260">
-        <pz:metadata type="publication-place">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="publication-name">
-          <xsl:value-of select="tmarc:sb" />
-        </pz:metadata>
-        <pz:metadata type="publication-date">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="publication-place">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sb">
+	  <pz:metadata type="publication-name">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sc">
+	  <pz:metadata type="publication-date">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d300">
-        <pz:metadata type="physical-extent">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="physical-format">
-          <xsl:value-of select="tmarc:sb" />
-        </pz:metadata>
-        <pz:metadata type="physical-dimensions">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
-        <pz:metadata type="physical-accomp">
-          <xsl:value-of select="tmarc:se" />
-        </pz:metadata>
-        <pz:metadata type="physical-unittype">
-          <xsl:value-of select="tmarc:sf" />
-        </pz:metadata>
-        <pz:metadata type="physical-unitsize">
-          <xsl:value-of select="tmarc:sg" />
-        </pz:metadata>
-        <pz:metadata type="physical-specified">
-          <xsl:value-of select="tmarc:s3" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="physical-extent">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sb">
+	  <pz:metadata type="physical-format">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sc">
+	  <pz:metadata type="physical-dimensions">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:se">
+	  <pz:metadata type="physical-accomp">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sf">
+	  <pz:metadata type="physical-unittype">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sg">
+	  <pz:metadata type="physical-unitsize">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:s3">
+	  <pz:metadata type="physical-specified">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d440">
-        <pz:metadata type="series-title">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="series-title">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d500">
@@ -403,249 +479,70 @@
         </pz:metadata>
       </xsl:for-each>
 
-      <xsl:for-each select="tmarc:d600">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d610">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d611">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d630">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d648">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d650">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d651">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d653">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d654">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d655">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d656">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
+      <xsl:for-each select="tmarc:d600 | tmarc:d610 | tmarc:d611 | tmarc:d630 |
+                            tmarc:d648 | tmarc:d650 | tmarc:d651 | tmarc:d653 |
+                            tmarc:d654 | tmarc:d655 | tmarc:d656 | tmarc:d657 |
+                            tmarc:d658 | tmarc:d662 | tmarc:d69X">
+	<xsl:for-each select="tmarc:sa">
+	  <pz:metadata type="subject">
+	    <xsl:value-of select="."/>
+	  </pz:metadata>
+	</xsl:for-each>
+	<pz:metadata type="subject-long">
+           <xsl:for-each select="node()/text()">
+             <xsl:if test="position() &gt; 1">
+               <xsl:text>, </xsl:text>
+             </xsl:if>
+            <xsl:variable name='value'>
+              <xsl:value-of select='normalize-space(.)'/>
+            </xsl:variable>
+            <xsl:choose>
+              <xsl:when test="substring($value, string-length($value)) = ','">
+                <xsl:value-of select="substring($value, 1, string-length($value)-1)"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="$value"/>
+              </xsl:otherwise>
+            </xsl:choose> 
           </xsl:for-each>
-        </pz:metadata>
+         </pz:metadata>
       </xsl:for-each>
 
-      <xsl:for-each select="tmarc:d657">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d658">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d662">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <xsl:for-each select="tmarc:d69X">
-        <pz:metadata type="subject">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="subject-long">
-          <xsl:for-each select="node()/text()">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
-      </xsl:for-each>
-
-      <!-- or tmarc:d651 or tmarc:d653 or tmarc:d654 or tmarc:d655 or tmarc:d656 
-        or tmarc:d657 or tmarc:d658 or tmarc:d662 or tmarc:d69X"> -->
-
-      <!-- <xsl:for-each select="tmarc:d600" > <pz:metadata type="subject"> 
-        <xsl:value-of select="tmarc:sa"/> </pz:metadata> <pz:metadata type="subject-long"> 
-        <xsl:for-each select="tmarc:sa tmarc:sb tmarc:sc tmarc:sd "> <xsl:if test="position() 
-        > 1"> <xsl:text>, </xsl:text> </xsl:if> <xsl:value-of select="."/> </xsl:for-each> 
-        </pz:metadata> </xsl:for-each> -->
-
       <xsl:for-each select="tmarc:d856">
-        <pz:metadata type="electronic-url">
-          <xsl:value-of select="tmarc:su" />
-        </pz:metadata>
+	<xsl:for-each select="tmarc:su">
+	  <pz:metadata type="electronic-url">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
         <pz:metadata type="electronic-text">
-          <xsl:choose>
+	  <xsl:choose>
 	    <xsl:when test="tmarc:sy">
 	      <xsl:value-of select="tmarc:sy/text()" />
 	    </xsl:when>
 	    <xsl:when test="tmarc:s3">
 	      <xsl:value-of select="tmarc:s3/text()" />
 	    </xsl:when>
-	     <xsl:otherwise>Get resource</xsl:otherwise>
-	   </xsl:choose>
-        </pz:metadata>
-        <pz:metadata type="electronic-note">
-          <xsl:value-of select="tmarc:sz" />
-        </pz:metadata>
-        <pz:metadata type="electronic-format-instruction">
-          <xsl:value-of select="tmarc:si" />
-        </pz:metadata>
-        <pz:metadata type="electronic-format-type">
-          <xsl:value-of select="tmarc:sq" />
+	    <xsl:when test="tmarc:sa">
+	      <xsl:value-of select="tmarc:sa/text()" />
+	    </xsl:when>
+	    <xsl:otherwise>Get resource</xsl:otherwise>
+	  </xsl:choose>
         </pz:metadata>
+	<xsl:for-each select="tmarc:sz">
+	  <pz:metadata type="electronic-note">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:si">
+	  <pz:metadata type="electronic-format-instruction">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
+	<xsl:for-each select="tmarc:sq">
+	  <pz:metadata type="electronic-format-type">
+	    <xsl:value-of select="." />
+	  </pz:metadata>
+	</xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d773">
@@ -655,15 +552,72 @@
             <xsl:text> </xsl:text>
           </xsl:for-each>
         </pz:metadata>
-        <xsl:if test="tmarc:st">
+        <xsl:for-each select="tmarc:st">
           <pz:metadata type="journal-title">
-            <xsl:value-of select="tmarc:st"/>
+            <xsl:value-of select="."/>
           </pz:metadata>
-        </xsl:if>
+        </xsl:for-each>
         <xsl:if test="tmarc:sg">
+	  <xsl:variable name="value">
+            <xsl:for-each select="tmarc:sg">
+              <xsl:value-of select="."/>
+            </xsl:for-each>
+	  </xsl:variable>
           <pz:metadata type="journal-subpart">
-            <xsl:value-of select="tmarc:sg"/>
-          </pz:metadata>
+            <xsl:value-of select="$value"/>
+	  </pz:metadata>
+	  <xsl:variable name="l">
+	    <xsl:value-of select="translate($value,
+				  'ABCDEFGHIJKLMNOPQRSTUVWXYZ.',
+				  'abcdefghijklmnopqrstuvwxyz ') "/>
+	  </xsl:variable>
+	  <xsl:variable name="volume">
+	    <xsl:choose>
+	      <xsl:when test="string-length(substring-after($l,'vol ')) &gt; 0">
+		<xsl:value-of select="substring-before(normalize-space(substring-after($l,'vol ')),' ')"/>
+	      </xsl:when>
+	      <xsl:when test="string-length(substring-after($l,'v ')) &gt; 0">
+		<xsl:value-of select="substring-before(normalize-space(substring-after($l,'v ')),' ')"/>
+	      </xsl:when>
+	    </xsl:choose>
+	  </xsl:variable>
+	  <xsl:variable name="issue">
+	    <xsl:value-of select="substring-before(translate(normalize-space(substring-after($l,'issue')), ',', ' '),' ')"/>
+	  </xsl:variable>
+	  <xsl:variable name="pages">
+	    <xsl:choose>
+	      <xsl:when test="string-length(substring-after($l,' p ')) &gt; 0">
+		<xsl:value-of select="normalize-space(substring-after($l,' p '))"/>
+	      </xsl:when>
+	      <xsl:when test="string-length(substring-after($l,',p')) &gt; 0">
+		<xsl:value-of select="normalize-space(substring-after($l,',p'))"/>
+	      </xsl:when>
+	      <xsl:when test="string-length(substring-after($l,' p')) &gt; 0">
+		<xsl:value-of select="normalize-space(substring-after($l,' p'))"/>
+	      </xsl:when>
+	    </xsl:choose>
+	  </xsl:variable>
+
+	  <!-- volume -->
+	  <xsl:if test="string-length($volume) &gt; 0">
+	    <pz:metadata type="volume-number">
+	      <xsl:value-of select="$volume"/>
+	    </pz:metadata>
+	  </xsl:if>
+	  <!-- issue -->
+	  <xsl:if test="string-length($issue) &gt; 0">
+	    <pz:metadata type="issue-number">
+	      <xsl:value-of select="$issue"/>
+	    </pz:metadata>
+	  </xsl:if>
+	  <!-- pages -->
+	  <xsl:if test="string-length($pages) &gt; 0">
+	    <pz:metadata type="pages-number">
+	      <xsl:value-of select="$pages"/>
+	    </pz:metadata>
+	  </xsl:if>
+
+	  <!-- season -->
         </xsl:if>
         <xsl:if test="tmarc:sp">
           <pz:metadata type="journal-title-abbrev">
@@ -673,22 +627,22 @@
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d852">
-        <xsl:if test="tmarc:sy">
+        <xsl:for-each select="tmarc:sy">
           <pz:metadata type="publicnote">
-            <xsl:value-of select="tmarc:sy" />
+            <xsl:value-of select="." />
           </pz:metadata>
-        </xsl:if>
-        <xsl:if test="tmarc:sh">
+        </xsl:for-each>
+        <xsl:for-each select="tmarc:sh">
           <pz:metadata type="callnumber">
-            <xsl:value-of select="tmarc:sh" />
+            <xsl:value-of select="." />
           </pz:metadata>
-        </xsl:if>
+        </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d876">
         <xsl:if test="tmarc:sf">
           <pz:metadata type="loan-period">
-            <xsl:value-of select="tmarc:sf" />
+            <xsl:value-of select="concat(tmarc:s5,':',tmarc:sf)" />
           </pz:metadata>
         </xsl:if>
       </xsl:for-each>
@@ -763,6 +717,16 @@
         </pz:metadata>
       </xsl:for-each>
 
+      <xsl:for-each select="tmarc:d903">
+        <xsl:if test="tmarc:sa">
+          <pz:metadata type="publication-date">
+            <xsl:value-of select="substring(tmarc:sa,1,4)"/>
+          </pz:metadata>
+          <pz:metadata type="date">
+            <xsl:value-of select="substring(tmarc:sa,1,4)"/>
+          </pz:metadata>
+        </xsl:if>
+      </xsl:for-each>
 
       <!-- <xsl:if test="$fulltext_b"> <pz:metadata type="fulltext"> <xsl:value-of 
         select="$fulltext_b"/> </pz:metadata> </xsl:if> -->
@@ -771,33 +735,42 @@
         <xsl:value-of select="$has_fulltext"/>
       </pz:metadata>
 
-      <xsl:for-each select="tmarc:d901 ! tmarc:d907">
+      <xsl:for-each select="tmarc:d907 | tmarc:d901">
         <pz:metadata type="iii-id">
           <xsl:value-of select="tmarc:sa" />
         </pz:metadata>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d926">
-        <pz:metadata type="locallocation">
-	  <xsl:choose><xsl:when test="tmarc:sa">
-	    <xsl:value-of select="tmarc:sa"/>
-	  </xsl:when><xsl:otherwise>
-	    <xsl:text>PAZPAR2_NULL_VALUE</xsl:text>
-	  </xsl:otherwise></xsl:choose>
+        <pz:metadata type="locallocation" empty="PAZPAR2_NULL_VALUE">
+	  <xsl:value-of select="tmarc:sa"/>
 	</pz:metadata>
-        <pz:metadata type="callnumber">
-	  <xsl:choose><xsl:when test="tmarc:sc">
-	    <xsl:value-of select="tmarc:sc"/>
-	  </xsl:when><xsl:otherwise>
-	    <xsl:text>PAZPAR2_NULL_VALUE</xsl:text>
-	  </xsl:otherwise></xsl:choose>
+        <pz:metadata type="callnumber" empty="PAZPAR2_NULL_VALUE">
+	  <xsl:value-of select="tmarc:sc"/>
 	</pz:metadata>
-        <pz:metadata type="available">
-	  <xsl:choose><xsl:when test="tmarc:se">
-	    <xsl:value-of select="tmarc:se"/>
-	  </xsl:when><xsl:otherwise>
-	    <xsl:text>PAZPAR2_NULL_VALUE</xsl:text>
-	  </xsl:otherwise></xsl:choose>
+        <pz:metadata type="available" empty="PAZPAR2_NULL_VALUE">
+	  <xsl:value-of select="tmarc:se"/>
+	</pz:metadata>
+      </xsl:for-each>
+
+      <!-- OhioLINK holdings -->
+      <xsl:for-each select="tmarc:d945">
+	<pz:metadata type="locallocation" empty="PAZPAR2_NULL_VALUE">
+	  <xsl:value-of select="tmarc:sa"/>
+	</pz:metadata>
+	<pz:metadata type="callnumber" empty="PAZPAR2_NULL_VALUE">
+	  <xsl:value-of select="tmarc:sb"/>
+	</pz:metadata>
+	<pz:metadata type="publicnote" empty="PAZPAR2_NULL_VALUE">
+	  <xsl:value-of select="tmarc:sc"/>
+	</pz:metadata>
+	<pz:metadata type="available" empty="PAZPAR2_NULL_VALUE">
+          <xsl:choose>
+            <xsl:when test="tmarc:ss = 'N'">Available</xsl:when>
+            <xsl:otherwise>
+	      <xsl:value-of select="tmarc:sd"/>
+	    </xsl:otherwise>
+	  </xsl:choose>
 	</pz:metadata>
       </xsl:for-each>
 
@@ -853,53 +826,4 @@
 
   <xsl:template match="text()" />
 
-  <!-- TODO Does not work anymore -->
-  <xsl:template name="shortTitle">
-    <xsl:param name="tag" />
-    <xsl:for-each select="tmarc:d">
-      <xsl:value-of select="tmarc:sa" />
-      <xsl:value-of select="tmarc:sm" />
-      <xsl:value-of select="tmarc:sn" />
-      <xsl:value-of select="tmarc:sp" />
-      <xsl:value-of select="tmarc:sr" />
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- No working as expected -->
-  <xsl:template name="description">
-    <xsl:param name="element" />
-    <xsl:for-each select="$element">
-      <pz:metadata type="description">
-        <xsl:for-each select="node()">
-          <xsl:value-of select="text()" />
-        </xsl:for-each>
-      </pz:metadata>
-    </xsl:for-each>
-    <xsl:apply-templates />
-  </xsl:template>
-
-  <!-- <xsl:for-each select="tmarc:d500"> <pz:metadata type="description"> 
-    <xsl:for-each select="node()"> <xsl:value-of select="text()"/> </xsl:for-each> 
-    </pz:metadata> </xsl:for-each> -->
-
-
-
-  <xsl:template name="subject">
-    <xsl:param name="element" />
-    <xsl:for-each select="$element">
-      <pz:metadata type="subject">
-        <xsl:value-of select="tmarc:sa" />
-      </pz:metadata>
-      <pz:metadata type="subject-long">
-        <xsl:for-each select="node()/text()">
-          <xsl:if test="position() > 1">
-            <xsl:text>, </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="." />
-        </xsl:for-each>
-      </pz:metadata>
-    </xsl:for-each>
-  </xsl:template>
-
-
 </xsl:stylesheet>