send to DataCite either Dataset, Software, or Workflow #10517

pdurbin · pdurbin · commit 8593d328ea5f · 2024-07-29T17:13:59.000-04:00
For resourceTypeGeneral.
diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java
@@ -16,6 +16,7 @@
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetAuthor;
 import edu.harvard.iq.dataverse.DvObject;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
 import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider;
 
 public class XmlMetadataTemplate {
@@ -43,6 +44,7 @@ public class XmlMetadataTemplate {
     private String publisher;
     private String publisherYear;
     private List<DatasetAuthor> authors;
+    private String resourceTypeGeneral;
     private String description;
     private List<String[]> contacts;
     private List<String[]> producers;
@@ -197,6 +199,22 @@ public String generateXML(DvObject dvObject) {
             }
         }
 
+        if (dvObject.isInstanceofDataset()) {
+            Dataset dataset = (Dataset) dvObject;
+            String datasetTypeName = dataset.getDatasetType().getName();
+            resourceTypeGeneral = switch (datasetTypeName) {
+                case "dataset" ->
+                    "Dataset";
+                case "software" ->
+                    "Software";
+                case "workflow" ->
+                    "Workflow";
+                default ->
+                    "Dataset";
+            };
+            xmlMetadata = xmlMetadata.replace("${resourceTypeGeneral}", resourceTypeGeneral);
+        }
+
         String relIdentifiers = generateRelatedIdentifiers(dvObject);
 
         xmlMetadata = xmlMetadata.replace("${relatedIdentifiers}", relIdentifiers);
@@ -311,4 +329,12 @@ public void setPublisherYear(String publisherYear) {
         this.publisherYear = publisherYear;
     }
 
+    public String getResourceTypeGeneral() {
+        return resourceTypeGeneral;
+    }
+
+    public void setResourceTypeGeneral(String resourceTypeGeneral) {
+        this.resourceTypeGeneral = resourceTypeGeneral;
+    }
+
 }
diff --git a/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/datacite_metadata_template.xml b/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/datacite_metadata_template.xml
@@ -9,7 +9,7 @@
     </titles>
     <publisher>${publisher}</publisher>
     <publicationYear>${publisherYear}</publicationYear>
-    <resourceType resourceTypeGeneral="Dataset"/>
+    <resourceType resourceTypeGeneral="${resourceTypeGeneral}"/>
     ${relatedIdentifiers}
     <descriptions>
         <description descriptionType="Abstract">${description}</description>
