From: Jakub Skoczen <jakub@indexdata.dk>
Date: Thu, 10 Dec 2009 10:11:57 +0000 (+0100)
Subject: Move mergekey definition to pazpar2.cfg
X-Git-Tag: v1.2.4~6^2~2
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=3c19f87bf19965aa789817738b15f74b5d598742;p=pazpar2-moved-to-github.git

Move mergekey definition to pazpar2.cfg

Moves mergekey definition away from the normalization stylesheets and
defines a mergekey common for all target types in pazpar2.cfg.
---

diff --git a/etc/cf.xsl b/etc/cf.xsl
index 9c0fb74..9438c75 100644
--- a/etc/cf.xsl
+++ b/etc/cf.xsl
@@ -16,12 +16,6 @@
 
   <xsl:template match="/record">
     <pz:record>
-      <xsl:attribute name="mergekey">
-	      <xsl:text>title </xsl:text>
-        <xsl:value-of select="title" />
-	      <xsl:text> author </xsl:text>
-        <xsl:value-of select="author"/>
-      </xsl:attribute>
       <xsl:apply-templates/>
     </pz:record>
   </xsl:template>
diff --git a/etc/dc.xsl b/etc/dc.xsl
index c8c3d0d..e2c4463 100644
--- a/etc/dc.xsl
+++ b/etc/dc.xsl
@@ -17,13 +17,6 @@
   <xsl:template match="/*">
     <pz:record>
 
-      <xsl:attribute name="mergekey">
-        <xsl:text>title </xsl:text>
-      	<xsl:value-of select="dc:title[1]"/>
-      	<xsl:text> author </xsl:text>
-      	<xsl:value-of select="dc:creator[1]"/>
-      </xsl:attribute>
-
       <pz:metadata type="id">
         <xsl:value-of select="dc:identifier"/>
       </pz:metadata>
diff --git a/etc/marc21.xsl b/etc/marc21.xsl
index 61cb641..8d8953a 100644
--- a/etc/marc21.xsl
+++ b/etc/marc21.xsl
@@ -43,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">
diff --git a/etc/marc22.xsl b/etc/marc22.xsl
index a655bd1..02e34e0 100644
--- a/etc/marc22.xsl
+++ b/etc/marc22.xsl
@@ -43,17 +43,9 @@
     </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>
 
       <pz:metadata type="medium">
-	<xsl:value-of select="$medium"/>
+    	<xsl:value-of select="$medium"/>
       </pz:metadata>
 
       <xsl:apply-templates/>
diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist
index f15a602..81bf883 100644
--- a/etc/pazpar2.cfg.dist
+++ b/etc/pazpar2.cfg.dist
@@ -39,7 +39,8 @@
       <metadata name="isbn"/>
       <metadata name="issn"/>
       <metadata name="tech-rep-nr"/>
-      <metadata name="author" brief="yes" termlist="yes" merge="unique" rank="2"/>
+      <metadata name="author" brief="yes" termlist="yes" merge="unique" 
+        rank="2" mergekey="optional"/>
       <metadata name="author-title"/>
       <metadata name="author-date"/>
       <metadata name="corporate-name"/>
@@ -51,13 +52,13 @@
       <metadata name="date" brief="yes" sortkey="numeric" type="year"
 		merge="range" termlist="yes"/>
       <metadata name="title" brief="yes" sortkey="skiparticle"
-		merge="longest" rank="6"/>
+		merge="longest" rank="6" mergekey="required"/>
       <metadata name="title-remainder" brief="yes" merge="longest" rank="5"/>
       <metadata name="title-responsibility" brief="yes" merge="longest"/>
       <metadata name="title-dates" brief="yes" merge="longest"/>
       <metadata name="title-medium" brief="yes" merge="longest"/>
       <metadata name="title-number-section" brief="yes" merge="longest"/>
-      <metadata name="medium" brief="yes" merge="no"/>
+      <metadata name="medium" brief="yes" merge="no" mergekey="optional"/>
       <metadata name="iii-id" brief="yes" merge="no"/>
       <metadata name="edition"/>
       <metadata name="publication-place"/>
diff --git a/etc/unimarc.xsl b/etc/unimarc.xsl
index 4621f87..4842e24 100644
--- a/etc/unimarc.xsl
+++ b/etc/unimarc.xsl
@@ -11,19 +11,6 @@
   <xsl:template match="/marc:record">
     <pz:record>
 
-      <xsl:attribute name="mergekey">
-        <xsl:text>title </xsl:text>
-	<xsl:value-of 
-            select="marc:datafield[@tag='200']/marc:subfield[@code='a']"/>
-	<xsl:text> author </xsl:text>
-	<xsl:value-of 
-            select="marc:datafield[@tag='700']/marc:subfield[@code='a']"/>
-        <xsl:text> </xsl:text>
-	<xsl:value-of 
-            select="marc:datafield[@tag='700']/marc:subfield[@code='b']"/>
-      </xsl:attribute>
-
-
       <xsl:for-each select="marc:controlfield[@tag='001']">
         <pz:metadata type="id">
           <xsl:value-of select="."/>