X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=etc%2Fmarc21.xsl;h=bb60a328af7658391ddd514f50d5337f32e86f66;hb=8432e60d3fa90e5bb4abf49607fdeca3fa8a19ba;hp=478e7f421fb6f99981bc9210b2348c73e206bb0a;hpb=4ffeb32f3d7066f4902ff675989fa1c3d3f501b1;p=pazpar2-moved-to-github.git

diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index 478e7f4..bb60a32 100644
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -42,17 +42,21 @@
       </xsl:choose>
     </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:variable name="has_fulltext">
+      <xsl:choose>
+        <xsl:when test="marc:datafield[@tag='856']/marc:subfield[@code='q']">
+          <xsl:text>yes</xsl:text>
+        </xsl:when>
+        <xsl:when test="marc:datafield[@tag='856']/marc:subfield[@code='i']='TEXT*'">
+          <xsl:text>yes</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>no</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
 
-      
+    <pz:record>
       <xsl:for-each select="marc:controlfield[@tag='001']">
         <pz:metadata type="id">
           <xsl:value-of select="."/>
@@ -85,7 +89,14 @@
 
       <xsl:for-each select="marc:datafield[@tag='035']">
         <pz:metadata type="system-control-nr">
-	  <xsl:value-of select="marc:subfield[@code='a']"/>
+          <xsl:choose>
+            <xsl:when test="marc:subfield[@code='a']">
+              <xsl:value-of select="marc:subfield[@code='a']"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="marc:subfield[@code='b']"/>
+            </xsl:otherwise>
+          </xsl:choose>
 	</pz:metadata>
       </xsl:for-each>
 
@@ -231,15 +242,35 @@
 	<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>
 
+      <pz:metadata type="has-fulltext">
+        <xsl:value-of select="$has_fulltext"/> 
+      </pz:metadata>
+
       <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']">