Looks in more places for system-control-nr

[pazpar2-moved-to-github.git] / etc / tmarc.xsl

diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl
index ea20b84..f561f81 100644 (file)
--- a/etc/tmarc.xsl
+++ b/etc/tmarc.xsl
@@ -82,12 +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="$typeofrec='a' or $typeofrec='i' and
            ($typeofserial='d' or $typeofserial='w')">data</xsl:when>
+       <xsl:when test="$typeofrec='a' and $biblevel='b'">article</xsl:when>
        <xsl:when test="$typeofrec='m'">software</xsl:when>
-        <xsl:when test="$journal_title">
-          <xsl:text>article</xsl:text>
-        </xsl:when>
         <xsl:when test="$title_medium">
           <xsl:value-of select="translate($title_medium, ' []/:', '')" />
         </xsl:when>
@@ -139,9 +138,16 @@
         </pz:metadata>
       </xsl:for-each>
 
-      <xsl:for-each select="tmarc:d035">
+      <xsl:for-each select="tmarc:d035"> 
         <pz:metadata type="system-control-nr">
-          <xsl:value-of select="tmarc:sa" />
+          <xsl:choose>
+            <xsl:when test="tmarc:sa">
+              <xsl:value-of select="tmarc:sa"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="tmarc:sb"/>
+            </xsl:otherwise>
+          </xsl:choose>
         </pz:metadata>
       </xsl:for-each>
 
@@ -644,12 +650,6 @@
         </pz:metadata>
       </xsl:for-each>
 
-      <pz:metadata tag="tag100">
-        <xsl:call-template name="shortTitle">
-          <xsl:with-param name="tag" select="100" />
-        </xsl:call-template>
-      </pz:metadata>
-
       <!-- passthrough id data -->
       <xsl:for-each select="pz:metadata">
         <xsl:copy-of select="." />