X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=etc%2Ftmarc.xsl;h=f652de15ed24cd8b20b56944ac8f651714f01ff4;hb=5f064711f19c662ae909233e6b266d5483d23227;hp=f6de26ba9b9f160a24aeaefd613835344910a3c8;hpb=94bf121cf213d798c560968e68948486fe3cdc59;p=pazpar2-moved-to-github.git

diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl
index f6de26b..f652de1 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>
@@ -138,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>
 
@@ -579,10 +586,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">
@@ -643,12 +649,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="." />