Standardize URI generation in 6XX fields.

Generate a URI for all 6XX fields except for 653. Resolves #61.

Author: wafschneider

test/ConvSpec-648-662.xspec

@@ -51,6 +51,7 @@
   <x:scenario label="656 - INDEX TERM--OCCUPATION">
     <x:context href="data/ConvSpec-648-662/marc.xml"/>
     <x:expect label="656 creates a subject/Topic property of the work" test="count(//bf:Work[1]/bf:subject/bf:Topic) = 3"/>
+    <x:expect label="...with a URI (not a blank node)" test="//bf:Work[1]/bf:subject[5]/bf:Topic/@rdf:about = 'http://example.org/1#Topic656-7'"/>
     <x:expect label="...with rdf:type of madsrdf:ComplexSubject" test="//bf:Work[1]/bf:subject[5]/bf:Topic/rdf:type/@rdf:resource = 'http://www.loc.gov/mads/rdf/v1#ComplexSubject'"/>
     <x:expect label="$akvxyz creates an rdfs:label property of the Topic" test="//bf:Work[1]/bf:subject[5]/bf:Topic/rdfs:label = 'Chauffeurs--France.'"/>
     <x:expect label="...and become components in the madsrdf:componentList of the Topic" test="//bf:Work[1]/bf:subject[5]/bf:Topic/madsrdf:componentList/madsrdf:Occupation/rdfs:label = 'Chauffeurs'"/>
@@ -60,6 +61,7 @@
   <x:scenario label="662 - SUBJECT ADDED ENTRY--HIERARCHICAL PLACE NAME">
     <x:context href="data/ConvSpec-648-662/marc.xml"/>
     <x:expect label="662 creates a subject/Place property of the work" test="count(//bf:Work[1]/bf:subject/bf:Place) = 2"/>
+    <x:expect label="...with a URI (not a blank node)" test="//bf:Work[1]/bf:subject[6]/bf:Place/@rdf:about = 'http://example.org/1#Place662-8'"/>
     <x:expect label="...with rdf:type of madsrdf:HierarchicalGeographic" test="//bf:Work[1]/bf:subject[6]/bf:Place/rdf:type/@rdf:resource = 'http://www.loc.gov/mads/rdf/v1#HierarchicalGeographic'"/>
     <x:expect label="$abcdfgh creates an rdfs:label property of the Topic" test="//bf:Work[1]/bf:subject[6]/bf:Place/rdfs:label = 'Japan--Hokkaido--Asahi-dake.'"/>
     <x:expect label="...and become components in the madsrdf:componentList of the Topic" test="//bf:Work[1]/bf:subject[6]/bf:Place/madsrdf:componentList/*[3]/rdfs:label = 'Asahi-dake'"/>

xsl/ConvSpec-648-662.xsl

@@ -22,6 +22,9 @@
         <xsl:when test="@tag='648'">
           <xsl:value-of select="$recordid"/>#Temporal<xsl:value-of select="@tag"/>-<xsl:value-of select="position()"/>
         </xsl:when>
+        <xsl:when test="@tag='651'">
+          <xsl:value-of select="$recordid"/>#Place<xsl:value-of select="@tag"/>-<xsl:value-of select="position()"/>
+        </xsl:when>
         <xsl:when test="@tag='655'">
           <xsl:value-of select="$recordid"/>#GenreForm<xsl:value-of select="@tag"/>-<xsl:value-of select="position()"/>
         </xsl:when>
@@ -291,14 +294,20 @@
   </xsl:template>
 
   <xsl:template match="marc:datafield[@tag='656']" mode="work">
+    <xsl:param name="recordid"/>
     <xsl:param name="serialization" select="'rdfxml'"/>
+    <xsl:variable name="vDefaultUri">
+      <xsl:value-of select="$recordid"/>#Topic<xsl:value-of select="@tag"/>-<xsl:value-of select="position()"/>
+    </xsl:variable>
     <xsl:apply-templates select="." mode="work656">
       <xsl:with-param name="serialization" select="$serialization"/>
+      <xsl:with-param name="pDefaultUri" select="$vDefaultUri"/>
     </xsl:apply-templates>
   </xsl:template>
 
   <xsl:template match="marc:datafield" mode="work656">
     <xsl:param name="serialization" select="'rdfxml'"/>
+    <xsl:param name="pDefaultUri"/>
     <xsl:variable name="vTag">
       <xsl:choose>
         <xsl:when test="@tag='880'"><xsl:value-of select="substring(marc:subfield[@code='6'],1,3)"/></xsl:when>
@@ -317,7 +326,9 @@
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="vTopicUri">
-      <xsl:apply-templates mode="generateUri" select="."/>
+      <xsl:apply-templates mode="generateUri" select=".">
+        <xsl:with-param name="pDefaultUri" select="$pDefaultUri"/>
+      </xsl:apply-templates>
     </xsl:variable>
     <xsl:choose>
       <xsl:when test="$serialization='rdfxml'">
@@ -369,14 +380,20 @@
   </xsl:template>
 
   <xsl:template match="marc:datafield[@tag='662']" mode="work">
+    <xsl:param name="recordid"/>
     <xsl:param name="serialization" select="'rdfxml'"/>
+    <xsl:variable name="vDefaultUri">
+      <xsl:value-of select="$recordid"/>#Place<xsl:value-of select="@tag"/>-<xsl:value-of select="position()"/>
+    </xsl:variable>
     <xsl:apply-templates select="." mode="work662">
       <xsl:with-param name="serialization" select="$serialization"/>
+      <xsl:with-param name="pDefaultUri" select="$vDefaultUri"/>
     </xsl:apply-templates>
   </xsl:template>
 
   <xsl:template match="marc:datafield" mode="work662">
     <xsl:param name="serialization" select="'rdfxml'"/>
+    <xsl:param name="pDefaultUri"/>
     <xsl:variable name="vXmlLang"><xsl:apply-templates select="." mode="xmllang"/></xsl:variable>
     <xsl:variable name="vLabel">
       <xsl:call-template name="chopPunctuation">
@@ -389,7 +406,9 @@
       </xsl:call-template>
     </xsl:variable>
     <xsl:variable name="vPlaceUri">
-      <xsl:apply-templates mode="generateUri" select="."/>
+      <xsl:apply-templates mode="generateUri" select=".">
+        <xsl:with-param name="pDefaultUri" select="$pDefaultUri"/>
+      </xsl:apply-templates>
     </xsl:variable>
     <xsl:choose>
       <xsl:when test="$serialization='rdfxml'">

xsl/ConvSpec-880.xsl

@@ -174,6 +174,12 @@
       <xsl:when test="($tag='648' or $tag='650' or $tag='651') or ($tag='655' and @ind1=' ')">
         <xsl:variable name="vTopicUri">
           <xsl:choose>
+            <xsl:when test="$tag='648'">
+              <xsl:value-of select="$recordid"/>#Temporal880-<xsl:value-of select="position()"/>
+            </xsl:when>
+            <xsl:when test="$tag='651'">
+              <xsl:value-of select="$recordid"/>#Place880-<xsl:value-of select="position()"/>
+            </xsl:when>
             <xsl:when test="$tag='655'">
               <xsl:value-of select="$recordid"/>#GenreForm880-<xsl:value-of select="position()"/>
             </xsl:when>
@@ -194,12 +200,20 @@
         </xsl:apply-templates>
       </xsl:when>
       <xsl:when test="$tag='656'">
+        <xsl:variable name="vDefaultUri">
+          <xsl:value-of select="$recordid"/>#Topic880-<xsl:value-of select="position()"/>
+        </xsl:variable>
         <xsl:apply-templates select="." mode="work656">
+          <xsl:with-param name="pDefaultUri" select="$vDefaultUri"/>
           <xsl:with-param name="serialization" select="$serialization"/>
         </xsl:apply-templates>
       </xsl:when>
       <xsl:when test="$tag='662'">
+        <xsl:variable name="vDefaultUri">
+          <xsl:value-of select="$recordid"/>#Place880-<xsl:value-of select="position()"/>
+        </xsl:variable>
         <xsl:apply-templates select="." mode="work662">
+          <xsl:with-param name="pDefaultUri" select="$vDefaultUri"/>
           <xsl:with-param name="serialization" select="$serialization"/>
         </xsl:apply-templates>
       </xsl:when>