X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fmarc21.xsl;h=d1699dc65f1bab45967908a55b9c86841a1b3438;hb=2628f9508a3b56be7071f2db91f9f4fd1f6f2d52;hp=c0a0b79a7685697a82715d2333e87286455d374d;hpb=a90a784de24517b588dcca35dcb413d2c5af2190;p=pazpar2-moved-to-github.git

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index c0a0b79..d1699dc 100644
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -4,15 +4,14 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:pz="http://www.indexdata.com/pazpar2/1.0"
     xmlns:marc="http://www.loc.gov/MARC21/slim">
-
   
   <xsl:output indent="yes" method="xml" version="1.0" encoding="UTF-8"/>
 
 <!-- Extract metadata from MARC21/USMARC 
       http://www.loc.gov/marc/bibliographic/ecbdhome.html
 -->  
-  <xsl:include href="pz2-ourl-marc21.xsl" />
-  
+  <xsl:template name="record-hook"/>
+
   <xsl:template match="/marc:record">
     <xsl:variable name="title_medium" select="marc:datafield[@tag='245']/marc:subfield[@code='h']"/>
     <xsl:variable name="journal_title" select="marc:datafield[@tag='773']/marc:subfield[@code='t']"/>
@@ -30,9 +29,6 @@
 	<xsl:when test="$fulltext_b">
 	  <xsl:text>electronic resource</xsl:text>
 	</xsl:when>
-	<xsl:when test="$electronic_location_url">
-	  <xsl:text>electronic resource</xsl:text>
-	</xsl:when>
 	<xsl:when test="$journal_title">
 	  <xsl:text>article</xsl:text>
 	</xsl:when>
@@ -83,6 +79,12 @@
 	</pz:metadata>
       </xsl:for-each>
 
+      <xsl:for-each select="marc:datafield[@tag='035']">
+        <pz:metadata type="system-control-nr">
+	  <xsl:value-of select="marc:subfield[@code='a']"/>
+	</pz:metadata>
+      </xsl:for-each>
+
       <xsl:for-each select="marc:datafield[@tag='100']">
 	<pz:metadata type="author">
 	  <xsl:value-of select="marc:subfield[@code='a']"/>
@@ -194,10 +196,8 @@
 	</pz:metadata>
       </xsl:for-each>
 
-      <xsl:for-each select="marc:datafield[@tag &gt;= 500 and @tag &lt;= 599]
-			    [@tag != '506' and @tag != '530' and
-			    @tag != '540' and @tag != '546'
-                            and @tag != '522']">
+      <xsl:for-each select="marc:datafield[@tag = '500' or @tag = '505' or
+      		@tag = '518' or @tag = '520' or @tag = '522']">
 	<pz:metadata type="description">
             <xsl:value-of select="*/text()"/>
         </pz:metadata>
@@ -222,7 +222,7 @@
 	  <xsl:value-of select="marc:subfield[@code='u']"/>
 	</pz:metadata>
 	<pz:metadata type="electronic-text">
-	  <xsl:value-of select="marc:subfield[@code='y']"/>
+	  <xsl:value-of select="marc:subfield[@code='y' or @code='3']"/>
 	</pz:metadata>
 	<pz:metadata type="electronic-note">
 	  <xsl:value-of select="marc:subfield[@code='z']"/>
@@ -266,6 +266,12 @@
 	</pz:metadata>
       </xsl:if> -->
 
+      <xsl:for-each select="marc:datafield[@tag='907' or @tag='901']">
+        <pz:metadata type="iii-id">
+	  <xsl:value-of select="marc:subfield[@code='a']"/>
+	</pz:metadata>
+      </xsl:for-each>
+
       <xsl:for-each select="marc:datafield[@tag='926']">
         <pz:metadata type="holding">
 	  <xsl:for-each select="marc:subfield">
@@ -277,7 +283,7 @@
         </pz:metadata>
       </xsl:for-each>
 
-      <xsl:for-each select="marc:datafield[@tag='991']">
+      <xsl:for-each select="marc:datafield[@tag='948']">
         <pz:metadata type="holding">
 	  <xsl:for-each select="marc:subfield">
 	    <xsl:if test="position() > 1">
@@ -288,15 +294,28 @@
         </pz:metadata>
       </xsl:for-each>
 
-
-      <xsl:if test="$open_url_resolver">
-        <pz:metadata type="open-url">
-            <xsl:call-template name="insert-md-openurl" />
+      <xsl:for-each select="marc:datafield[@tag='991']">
+        <pz:metadata type="holding">
+	  <xsl:for-each select="marc:subfield">
+	    <xsl:if test="position() > 1">
+	      <xsl:text> </xsl:text>
+	    </xsl:if>
+	    <xsl:value-of select="."/>
+	  </xsl:for-each>
         </pz:metadata>
-      </xsl:if>
+      </xsl:for-each>
 
-    </pz:record>
+      <!-- passthrough id data -->
+      <xsl:for-each select="pz:metadata">
+          <xsl:copy-of select="."/>
+      </xsl:for-each>
+
+      <!-- other stylesheets importing this might want to define this -->
+      <xsl:call-template name="record-hook"/>
 
+    </pz:record>    
   </xsl:template>
+  
+  <xsl:template match="text()"/>
 
 </xsl:stylesheet>