X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=etc%2Ftmarc.xsl;h=0dc7b20e1cfb916e90d4f4cb3c61e858060705bc;hb=ad96f98478e2e653c503ae3cbfc3a3b80f0c5a1b;hp=7f9cade0afc1b5631f8a8896221a694d6aad0044;hpb=e3d415351a094086ef8f75bb385def917ac5aea5;p=pazpar2-moved-to-github.git

diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl
index 7f9cade..0dc7b20 100644
--- a/etc/tmarc.xsl
+++ b/etc/tmarc.xsl
@@ -15,6 +15,12 @@
       <xsl:apply-templates />
   </xsl:template>
 
+  <xsl:template match="tmarc:collection">
+    <collection>
+      <xsl:apply-templates />
+    </collection>
+  </xsl:template>
+
   <xsl:template match="tmarc:r">
     <xsl:variable name="title_medium" select="tmarc:d245/tmarc:sh" />
     <xsl:variable name="journal_title" select="tmarc:d773/tmarc:st" />
@@ -230,6 +236,10 @@
         <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>
 
       <xsl:for-each select="tmarc:d250">
@@ -617,14 +627,27 @@
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d926">
-        <pz:metadata type="holding">
-          <xsl:for-each select="tmarc:s">
-            <xsl:if test="position() > 1">
-              <xsl:text> </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
-        </pz:metadata>
+        <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>
+        <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>
+        <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>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d948">