Got rid of the dubious "role=logo" attribute export. #3648

IQSS · Apr 19, 2023 · 74497e5 · 74497e5
1 parent 14603c2
commit 74497e5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java
@@ -94,7 +94,6 @@ public class DdiExportUtil {
     public static final String CITATION_BLOCK_NAME = "citation";
 
     public static String datasetDtoAsJson2ddi(String datasetDtoAsJson) {
-        logger.fine(JsonUtil.prettyPrint(datasetDtoAsJson));
         Gson gson = new Gson();
         DatasetDTO datasetDto = gson.fromJson(datasetDtoAsJson, DatasetDTO.class);
         try {
@@ -963,7 +962,6 @@ private static void writeProducersElement(XMLStreamWriter xmlw, DatasetVersionDT
                             String producerAffiliation = "";
                             String producerAbbreviation = "";
                             String producerLogo = "";
-                            String producerURL = "";
                             for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
                                 FieldDTO next = iterator.next();
                                 if (DatasetFieldConstant.producerName.equals(next.getTypeName())) {
@@ -978,10 +976,6 @@ private static void writeProducersElement(XMLStreamWriter xmlw, DatasetVersionDT
                                 if (DatasetFieldConstant.producerLogo.equals(next.getTypeName())) {
                                     producerLogo = next.getSinglePrimitive();
                                 }
-                                if (DatasetFieldConstant.producerURL.equals(next.getTypeName())) {
-                                    producerURL = next.getSinglePrimitive();
-
-                                }
                             }
                             if (!producerName.isEmpty()) {
                                 xmlw.writeStartElement("producer");
@@ -991,11 +985,8 @@ private static void writeProducersElement(XMLStreamWriter xmlw, DatasetVersionDT
                                 if (!producerAbbreviation.isEmpty()) {
                                     writeAttribute(xmlw, "abbr", producerAbbreviation);
                                 }
-                                if (!producerLogo.isEmpty()) {
+                                /*if (!producerLogo.isEmpty()) {
                                     writeAttribute(xmlw, "role", producerLogo);
-                                }
-                                /* NOT IN THE SCHEMA! -L.A. if (!producerURL.isEmpty()) {
-                                    writeAttribute(xmlw, "URI", producerURL);
                                 }*/
                                 xmlw.writeCharacters(producerName);
                                 xmlw.writeEndElement(); //AuthEnty
@@ -1010,9 +1001,7 @@ private static void writeProducersElement(XMLStreamWriter xmlw, DatasetVersionDT
         // productionPlace was made multiple as of 5.14:
         // (a quick backward compatibility check was added to dto2PrimitiveList(),
         // see the method for details)
-        for (String productionPlace : dto2PrimitiveList(version, DatasetFieldConstant.productionPlace)) {
-            writeFullElement(xmlw, "prodPlac", productionPlace);
-        }
+        writeFullElementList(xmlw, "prodPlac", dto2PrimitiveList(version, DatasetFieldConstant.productionPlace));        
         writeSoftwareElement(xmlw, version);
 
         writeGrantElement(xmlw, version);
@@ -1032,7 +1021,6 @@ private static void writeDistributorsElement(XMLStreamWriter xmlw, DatasetVersio
                             String distributorAffiliation = "";
                             String distributorAbbreviation = "";
                             String distributorURL = "";
-                            String distributorLogoURL = "";
                             for (Iterator<FieldDTO> iterator = foo.iterator(); iterator.hasNext();) {
                                 FieldDTO next = iterator.next();
                                 if (DatasetFieldConstant.distributorName.equals(next.getTypeName())) {
@@ -1047,9 +1035,6 @@ private static void writeDistributorsElement(XMLStreamWriter xmlw, DatasetVersio
                                 if (DatasetFieldConstant.distributorURL.equals(next.getTypeName())) {
                                     distributorURL = next.getSinglePrimitive();
                                 }
-                                if (DatasetFieldConstant.distributorLogo.equals(next.getTypeName())) {
-                                    distributorLogoURL = next.getSinglePrimitive();
-                                }
                             }
                             if (!distributorName.isEmpty()) {
                                 xmlw.writeStartElement("distrbtr");
@@ -1065,10 +1050,6 @@ private static void writeDistributorsElement(XMLStreamWriter xmlw, DatasetVersio
                                 if (!distributorURL.isEmpty()) {
                                     writeAttribute(xmlw, "URI", distributorURL);
                                 }
-                                /* NOT IN THE SCHEMA! -L.A.if (!distributorLogoURL.isEmpty()) {
-                                   (and why were we putting this logo into the "role" field anyway?? - same with producerLogo above!)
-                                    writeAttribute(xmlw, "role", distributorLogoURL);
-                                }*/
                                 xmlw.writeCharacters(distributorName);
                                 xmlw.writeEndElement(); //AuthEnty
                             }
@@ -1566,7 +1547,7 @@ private static List<String> dto2PrimitiveList(DatasetVersionDTO datasetVersionDT
                     // up on an instance that upgraded to a Dataverse version
                     // where a certain primitive has been made multiple, but has
                     // not yet update the block. 
-                    if (fieldDTO.getMultiple()) {
+                    if (fieldDTO.getMultiple() != null && fieldDTO.getMultiple()) {
                         return fieldDTO.getMultiplePrimitive();
                     } else {
                         return Arrays.asList(fieldDTO.getSinglePrimitive());

diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.xml b/src/test/java/edu/harvard/iq/dataverse/export/ddi/dataset-finch1.xml
@@ -23,7 +23,7 @@
         <AuthEnty affiliation="Birds Inc.">Finch, Fiona</AuthEnty>
       </rspStmt>
       <prodStmt>
-        <producer affiliation="Hawk Institute" abbr="ProdAbb" role="http://www.hawk.edu/logo">Johnny Hawk</producer>
+        <producer affiliation="Hawk Institute" abbr="ProdAbb">Johnny Hawk</producer>
       </prodStmt>
       <distStmt>
         <distrbtr xml:lang="en" affiliation="Valhalla Polytechnic" abbr="Dist-Abb" URI="http://www.valhalla.edu/url">Odin Raven</distrbtr>

diff --git a/src/test/java/edu/harvard/iq/dataverse/export/ddi/exportfull.xml b/src/test/java/edu/harvard/iq/dataverse/export/ddi/exportfull.xml
@@ -33,8 +33,8 @@
         <othId role="Data Curator">LastContributor2, FirstContributor2</othId>
       </rspStmt>
       <prodStmt>
-        <producer affiliation="ProducerAffiliation1" abbr="ProducerAbbreviation1" role="http://ProducerLogoURL1.org">LastProducer1, FirstProducer1</producer>
-        <producer affiliation="ProducerAffiliation2" abbr="ProducerAbbreviation2" role="http://ProducerLogoURL2.org">LastProducer2, FirstProducer2</producer>
+        <producer affiliation="ProducerAffiliation1" abbr="ProducerAbbreviation1">LastProducer1, FirstProducer1</producer>
+        <producer affiliation="ProducerAffiliation2" abbr="ProducerAbbreviation2">LastProducer2, FirstProducer2</producer>
         <prodDate>1003-01-01</prodDate>
         <prodPlac>ProductionPlace</prodPlac>
         <software version="SoftwareVersion1">SoftwareName1</software>