X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=etc%2Fmarc21.xsl;h=71178b70df6a3b156c7efe8c7e630a7a5a580b0d;hb=b0cc664ec016d7e2cfba5bffada691f49f813a2a;hp=d90647fa37bc0fe3a11ff3ee9ff3911574f41def;hpb=d9a7978eedb5bb26455d8b26693ce6fcec5db4d1;p=pazpar2-moved-to-github.git

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index d90647f..71178b7 100644
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -4,16 +4,19 @@
     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 match="/marc:record">
+  <xsl:template name="record-hook"/>
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <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']"/>
     <xsl:variable name="electronic_location_url" select="marc:datafield[@tag='856']/marc:subfield[@code='u']"/>
@@ -22,7 +25,7 @@
     <xsl:variable name="medium">
       <xsl:choose>
 	<xsl:when test="$title_medium">
-	  <xsl:value-of select="substring-after(substring-before($title_medium,']'),'[')"/>
+	  <xsl:value-of select="translate($title_medium, ' []/', '')"/>
 	</xsl:when>
 	<xsl:when test="$fulltext_a">
 	  <xsl:text>electronic resource</xsl:text>
@@ -40,15 +43,6 @@
     </xsl:variable>
 
     <pz:record>
-      <xsl:attribute name="mergekey">
-        <xsl:text>title </xsl:text>
-	<xsl:value-of select="marc:datafield[@tag='245']/marc:subfield[@code='a']"/>
-	<xsl:text> author </xsl:text>
-	<xsl:value-of select="marc:datafield[@tag='100']/marc:subfield[@code='a']"/>
-	<xsl:text> medium </xsl:text>
-	<xsl:value-of select="$medium"/>
-      </xsl:attribute>
-
       
       <xsl:for-each select="marc:controlfield[@tag='001']">
         <pz:metadata type="id">
@@ -228,15 +222,44 @@
 	<pz:metadata type="electronic-note">
 	  <xsl:value-of select="marc:subfield[@code='z']"/>
 	</pz:metadata>
+	<pz:metadata type="electronic-format-instruction">
+	  <xsl:value-of select="marc:subfield[@code='i']"/>
+	</pz:metadata>
+	<pz:metadata type="electronic-format-type">
+	  <xsl:value-of select="marc:subfield[@code='q']"/>
+	</pz:metadata>
       </xsl:for-each>
 
       <xsl:for-each select="marc:datafield[@tag='773']">
-	<pz:metadata type="citation">
-	  <xsl:for-each select="*">
-	    <xsl:value-of select="normalize-space(.)"/>
-	    <xsl:text> </xsl:text>
-	  </xsl:for-each>
-	</pz:metadata>
+    	<pz:metadata type="citation">
+	      <xsl:for-each select="*">
+	        <xsl:value-of select="normalize-space(.)"/>
+	        <xsl:text> </xsl:text>
+    	  </xsl:for-each>
+        </pz:metadata>
+        <xsl:if test="marc:subfield[@code='t']">
+    	  <pz:metadata type="journal-title">
+	        <xsl:value-of select="marc:subfield[@code='t']"/>
+          </pz:metadata>          
+        </xsl:if>
+        <xsl:if test="marc:subfield[@code='g']">
+    	  <pz:metadata type="journal-subpart">
+	        <xsl:value-of select="marc:subfield[@code='g']"/>
+          </pz:metadata>          
+        </xsl:if>
+      </xsl:for-each>
+
+      <xsl:for-each select="marc:datafield[@tag='852']">
+        <xsl:if test="marc:subfield[@code='y']">
+	  <pz:metadata type="publicnote">
+	    <xsl:value-of select="marc:subfield[@code='y']"/>
+	  </pz:metadata>
+	</xsl:if>
+	<xsl:if test="marc:subfield[@code='h']">
+	  <pz:metadata type="callnumber">
+	    <xsl:value-of select="marc:subfield[@code='h']"/>
+	  </pz:metadata>
+	</xsl:if>
       </xsl:for-each>
 
       <pz:metadata type="medium">
@@ -306,11 +329,13 @@
         </pz:metadata>
       </xsl:for-each>
 
-      <xsl:if test="$open_url_resolver">
-        <pz:metadata type="open-url">
-            <xsl:call-template name="insert-md-openurl" />
-        </pz:metadata>
-      </xsl:if>
+      <!-- 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>