use same date format as meta name="DC.date" IQSS#2243

uit-no-old · Nov 2, 2017 · ad71c6a · ad71c6a
1 parent 2cc958d
commit ad71c6a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -3864,23 +3864,6 @@ public String getDescription() {
         return workingVersion.getDescriptionPlainText();
     }
 
-    /**
-     * dataset publication date unpublished datasets will return an empty
-     * string.
-     *
-     * @return String dataset publication date (dd MMM yyyy).
-     */
-    public String getPublicationDate() {
-        assert (null != workingVersion);
-        if (DatasetVersion.VersionState.DRAFT == workingVersion.getVersionState()) {
-            return "";
-        }
-        Date rel_date = workingVersion.getReleaseTime();
-        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
-        String r = fmt.format(rel_date.getTime());
-        return r;
-    }
-
     /**
      * dataset authors
      *

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -1100,4 +1100,20 @@ public List<WorkflowComment> getWorkflowComments() {
         return workflowComments;
     }
 
+    /**
+     * dataset publication date unpublished datasets will return an empty
+     * string.
+     *
+     * @return String dataset publication date (dd MMM yyyy).
+     */
+    public String getPublicationDate() {
+        if (DatasetVersion.VersionState.DRAFT == this.getVersionState()) {
+            return "";
+        }
+        Date rel_date = this.getReleaseTime();
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
+        String r = fmt.format(rel_date.getTime());
+        return r;
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
@@ -498,7 +498,7 @@ public static String getJsonLd(DatasetVersion workingVersion) {
             authors.add(author);
         }
         job.add("author", authors);
-        job.add("datePublished", workingVersion.getProductionDate());
+        job.add("datePublished", workingVersion.getPublicationDate());
         job.add("schemaVersion", "http://datacite.org/schema/kernel-4");
         job.add("publisher", Json.createObjectBuilder()
                 .add("@type", "Organization")

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -24,7 +24,7 @@
 	    <meta name="DC.identifier" content="#{DatasetPage.persistentId}"/>
 	    <meta name="DC.type" content="Dataset"/>
 	    <meta name="DC.title" content="#{DatasetPage.title}"/>
-	    <meta name="DC.date" content="#{DatasetPage.publicationDate}"/>
+	    <meta name="DC.date" content="#{DatasetPage.workingVersion.publicationDate}"/>
 	    <meta name="DC.publisher" content="#{DatasetPage.publisher}" />
             <meta name="DC.description" content="#{DatasetPage.description}" />
 	    <ui:repeat var="author" value="#{DatasetPage.datasetAuthors}">