Mapped TERMSANDCONDITIONS to Copyright status instead of copyright note.

Author: lsitu

src/edu/ucsd/library/xdre/harvesting/CilHarvesting.java

@@ -147,15 +147,12 @@ record = new TabularRecord();
         }
 
         if (record != null) {
-            // Ignore copyrighted records (copyright note: copyright)
-            String copyrightNote = record.getData().remove(FieldMappings.COPYRIGHT_NOTE);
-            if (StringUtils.isNotBlank(copyrightNote)) {
-                if (copyrightNote.equalsIgnoreCase(COPYRIGHT_TEXT)) {
+            // Ignore copyrighted records (copyrightStatus: copyright)
+            String copyrightStatus = record.getData().get(FieldMappings.COPYRIGHT_STATUS.toLowerCase());
+            if (StringUtils.isNotBlank(copyrightStatus)) {
+                if (copyrightStatus.equalsIgnoreCase(COPYRIGHT_TEXT)) {
                     return nextRecord();
                 }
-
-                // Use copyrightNote header that is used in batch export/overlay
-                record.getData().put(TabularRecord.COPYRIGHT_NOTE, copyrightNote);
             }
         }
 

src/edu/ucsd/library/xdre/harvesting/FieldMappings.java

@@ -26,7 +26,7 @@
 public class FieldMappings
 {
 
-    public static final String COPYRIGHT_NOTE = "copyright note";
+    public static final String COPYRIGHT_STATUS = "copyrightStatus";
     public static final String TITLE = "title";
     public static final String DATE_CREATION = "date:creation";
     public static final String BEGIN_DATE = "Begin date";

src/resources/CIL Processing and Mapping Instructions.xlsx

@@ -321,9 +321,9 @@
     </xsl:template>
 
     <xsl:template name="damsCopyright" match="dams:Copyright">
-        <xsl:for-each select="dams:copyrightNote">
+        <xsl:for-each select="dams:copyrightStatus">
             <xsl:call-template name="appendJsonObject">
-               <xsl:with-param name="key">copyright note</xsl:with-param>
+               <xsl:with-param name="key">Copyright status</xsl:with-param>
                <xsl:with-param name="val"><xsl:value-of select="."/></xsl:with-param>
             </xsl:call-template>
         </xsl:for-each>

src/resources/dams42json.xsl

@@ -59,10 +59,10 @@ public void testExtractCopyrightNode() throws Exception {
         String[] files = {createJsonDataFile("test123.json").getAbsolutePath()};
         CilHarvesting cilHarvesting = new CilHarvesting(fieldMappings, constantFields, Arrays.asList(files));
         TabularRecord rec = (TabularRecord) cilHarvesting.nextRecord();
-        assertEquals("CopyrightNote does't match.", "attribution_nc_sa", rec.getData().get(TabularRecord.COPYRIGHT_NOTE.toLowerCase()));
+        assertEquals("CopyrightStatus does't match.", "attribution_nc_sa", rec.getData().get(TabularRecord.COPYRIGHT_STATUS.toLowerCase()));
 
         Document doc = rec.toRDFXML();
-        assertEquals("attribution_nc_sa", doc.valueOf("//dams:Object/dams:copyright//dams:copyrightNote"));
+        assertEquals("attribution_nc_sa", doc.valueOf("//dams:Object/dams:copyright//dams:copyrightStatus"));
     }
 
     @Test

test/edu/ucsd/library/xdre/harvesting/CilHavestingTest.java

@@ -262,8 +262,8 @@ protected Map<String, List<String>> initiateFiledMappings() {
         String[] identifierFields = {OBJECT_UNIQUE_ID, FieldMappings.IDENTIFIER_SAMPLENUMBER};
         fieldMappings.put(SOURCE_IDENTIFIER.toLowerCase(), Arrays.asList(identifierFields));
 
-        String[] copyrightNoteFields = {TabularRecord.COPYRIGHT_NOTE};
-        fieldMappings.put(SOURCE_TERMSANDCONDITIONS_FREE_TEXT.toLowerCase(), Arrays.asList(copyrightNoteFields));
+        String[] copyrightStatusFields = {TabularRecord.COPYRIGHT_STATUS};
+        fieldMappings.put(SOURCE_TERMSANDCONDITIONS_FREE_TEXT.toLowerCase(), Arrays.asList(copyrightStatusFields));
 
         String[] fileNameFields = {FieldMappings.FILE_NAME};
         fieldMappings.put(FieldMappings.SOURCE_IMAGE_FILE_PATH.toLowerCase(), Arrays.asList(fileNameFields));

test/edu/ucsd/library/xdre/harvesting/CilHavestingTestBase.java

@@ -12,7 +12,7 @@
     <xsl:template match="rdf:RDF">
         <xsl:call-template name="startJsonObject"/>
 
-        <xsl:for-each select="*">
+        <xsl:for-each select="*[local-name() != 'DAMSEvent']">
             <xsl:variable name="id"><xsl:value-of select="@rdf:about"/></xsl:variable>
             <xsl:variable name="count"><xsl:number level="any" count="dams:Object"/></xsl:variable>
             <xsl:variable name="objectId">
@@ -134,6 +134,10 @@
         <xsl:for-each select="*[local-name()='cartographics']">
             <xsl:apply-templates />
         </xsl:for-each>
+
+        <xsl:for-each select="*[local-name()='copyright']">
+            <xsl:apply-templates />
+        </xsl:for-each>
     </xsl:template>
 
     <xsl:template name="madsTitle" match="mads:Title">
@@ -297,7 +301,7 @@
     <xsl:template name="damsRelatedResource" match="dams:RelatedResource">
         <xsl:call-template name="appendJsonObject">
            <xsl:with-param name="key">Related resource:<xsl:value-of select="dams:type"/></xsl:with-param>
-           <xsl:with-param name="val"><xsl:value-of select="dams:uri/@rdf:resource"/> @ <xsl:value-of select="dams:description"/></xsl:with-param>
+           <xsl:with-param name="val"><xsl:value-of select="dams:description"/> @ <xsl:value-of select="dams:uri/@rdf:resource"/></xsl:with-param>
         </xsl:call-template>
     </xsl:template>
 
@@ -316,6 +320,15 @@
         </xsl:for-each>
     </xsl:template>
 
+    <xsl:template name="damsCopyright" match="dams:Copyright">
+        <xsl:for-each select="dams:copyrightStatus">
+            <xsl:call-template name="appendJsonObject">
+               <xsl:with-param name="key">Copyright status</xsl:with-param>
+               <xsl:with-param name="val"><xsl:value-of select="."/></xsl:with-param>
+            </xsl:call-template>
+        </xsl:for-each>
+    </xsl:template>
+
     <xsl:template name="damsResource">
         <xsl:value-of select="local-name()"/>
     </xsl:template>
@@ -366,8 +379,8 @@
                 <xsl:with-param name="key">Level</xsl:with-param>
                 <xsl:with-param name="val">
                     <xsl:choose>
-                        <xsl:when test="$depth = '1'">  \Component</xsl:when>
-                        <xsl:otherwise>    \Sub-component</xsl:otherwise>
+                        <xsl:when test="$depth = '1'">Component</xsl:when>
+                        <xsl:otherwise>Sub-component</xsl:otherwise>
                     </xsl:choose>
                 </xsl:with-param>
             </xsl:call-template>
@@ -377,6 +390,7 @@
             <xsl:for-each select="dams:hasComponent/dams:Component">
                 <xsl:sort select="dams:order" data-type="number" order="ascending" />
                 <xsl:call-template name="damsComponent">
+                   <xsl:with-param name="objectId"><xsl:value-of select="$objectId" /></xsl:with-param>
                    <xsl:with-param name="depth"><xsl:value-of select="$depth + 1"/></xsl:with-param>
                </xsl:call-template>
             </xsl:for-each>