EASY-2186: map technical description to EMD description (#35)

DANS-KNAW · Jul 3, 2019 · 71e97bb · 71e97bb
1 parent ba35702
commit 71e97bb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/nl/knaw/dans/pf/language/ddm/handlers/DescriptionHandler.java b/src/main/java/nl/knaw/dans/pf/language/ddm/handlers/DescriptionHandler.java
@@ -16,7 +16,6 @@
 package nl.knaw.dans.pf.language.ddm.handlers;
 
 import nl.knaw.dans.pf.language.ddm.handlertypes.BasicStringHandler;
-import nl.knaw.dans.pf.language.emd.types.BasicRemark;
 import nl.knaw.dans.pf.language.emd.types.BasicString;
 import org.xml.sax.SAXException;
 
@@ -29,9 +28,8 @@ protected void finishElement(final String uri, final String localName) throws SA
     boolean isTechnicalDescription = desciptionType != null && desciptionType.equals("TechnicalInfo");
     if (basicString != null) {
       if (isTechnicalDescription)
-        getTarget().getEmdOther().getEasRemarks().add(new BasicRemark("Instructions for Reuse: " + basicString.getValue()));
-      else
-        getTarget().getEmdDescription().getDcDescription().add(basicString);
+        basicString.setValue("Instructions for Reuse: " + basicString.getValue());
+      getTarget().getEmdDescription().getDcDescription().add(basicString);
     }
   }
 }
diff --git a/src/test/resources/ddm2emdCrosswalk/ddmDescriptionWithRequiredDescriptionType.input.xml b/src/test/resources/ddm2emdCrosswalk/ddmDescriptionWithRequiredDescriptionType.input.xml
@@ -2,7 +2,7 @@
 <ddm:DDM xmlns:ddm='http://easy.dans.knaw.nl/schemas/md/ddm/'
          xmlns:dcterms='http://purl.org/dc/terms/'>
     <ddm:profile>
-        <ddm:description ddm:descriptionType='Abstract'>abstract</ddm:description>
+        <ddm:description descriptionType='Abstract'>abstract</ddm:description>
         <ddm:description descriptionType="TechnicalInfo">remark1</ddm:description>
         <dcterms:description>beschrijving</dcterms:description>
     </ddm:profile>

diff --git a/src/test/resources/ddm2emdCrosswalk/ddmDescriptionWithRequiredDescriptionType.output.xml b/src/test/resources/ddm2emdCrosswalk/ddmDescriptionWithRequiredDescriptionType.output.xml
@@ -3,10 +3,10 @@
                   xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:eas="http://easy.dans.knaw.nl/easy/easymetadata/eas/" emd:version="0.1">
     <emd:description>
         <dc:description>abstract</dc:description>
+        <dc:description>Instructions for Reuse: remark1</dc:description>
         <dc:description>beschrijving</dc:description>
     </emd:description>
     <emd:other>
-        <eas:remark>Instructions for Reuse: remark1</eas:remark>
         <eas:application-specific>
             <eas:metadataformat>ANY_DISCIPLINE</eas:metadataformat>
             <eas:pakbon-status>NOT_IMPORTED</eas:pakbon-status>