X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=etc%2Ftmarc.xsl;h=a94131d2a6067af7ae4104eac1757bd595cd542d;hb=03658c18fc81f501c730a07d410043c88eff4d82;hp=f561f8123e9ea05a6f9cab84c368b9b44fc7702b;hpb=e5f5c04e9c9e3c9001e53981fdbad03e1c3842d2;p=pazpar2-moved-to-github.git

diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl
index f561f81..a94131d 100644
--- a/etc/tmarc.xsl
+++ b/etc/tmarc.xsl
@@ -82,11 +82,11 @@
 	<xsl:when test="$typeofrec='c' or $typeofrec='d'">music-score</xsl:when>
 	<xsl:when test="$form1='a' or $form1='b' or $form1='c'">microform</xsl:when>
 	<xsl:when test="$typeofrec='t'">thesis</xsl:when>
-        <xsl:when test="$journal_title">article</xsl:when>
+        <!-- <xsl:when test="$journal_title">article</xsl:when> -->
 	<xsl:when test="$typeofrec='a' or $typeofrec='i' and
-	    ($typeofserial='d' or $typeofserial='w')">data</xsl:when>
+	    ($typeofserial='d' or $typeofserial='w')">web</xsl:when>
 	<xsl:when test="$typeofrec='a' and $biblevel='b'">article</xsl:when>
-	<xsl:when test="$typeofrec='m'">software</xsl:when>
+	<xsl:when test="$typeofrec='m'">electronic</xsl:when>
         <xsl:when test="$title_medium">
           <xsl:value-of select="translate($title_medium, ' []/:', '')" />
         </xsl:when>
@@ -189,7 +189,7 @@
 
       <xsl:for-each select="tmarc:d260">
         <pz:metadata type="date">
-          <xsl:value-of select="tmarc:sc" />
+          <xsl:value-of select="translate(tmarc:sc, 'cp[].', '')" />
         </pz:metadata>
       </xsl:for-each>
 
@@ -230,6 +230,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">
@@ -586,10 +590,9 @@
 
       <pz:metadata type="medium">
         <xsl:value-of select="$medium" />
-      </pz:metadata>
-
-      <pz:metadata type="electronic">
-        <xsl:value-of select="$electronic"/>
+	<xsl:if test="string-length($electronic) and $medium != 'electronic'">
+	  <xsl:text> (electronic)</xsl:text>
+	</xsl:if>
       </pz:metadata>
 
       <xsl:for-each select="tmarc:d900/tmarc:sa">
@@ -618,14 +621,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">