IQSS#6 - Updated DataFileServiceBean to load activeFrom field

lionick · Oct 31, 2019 · 00d1e4f · 00d1e4f
1 parent 5aafcb6
commit 00d1e4f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java
@@ -822,7 +822,7 @@ private List<FileMetadata> retrieveFileMetadataForVersion(Dataset dataset, Datas
         }
         logger.fine("Retrieved and mapped "+i+" file categories attached to files in the version "+version.getId());
 
-        List<Object[]> metadataResults = em.createNativeQuery("select id, datafile_id, DESCRIPTION, LABEL, RESTRICTED, DIRECTORYLABEL, prov_freeform from FileMetadata where datasetversion_id = "+version.getId() + " ORDER BY LABEL").getResultList();
+        List<Object[]> metadataResults = em.createNativeQuery("select id, datafile_id, DESCRIPTION, LABEL, RESTRICTED, DIRECTORYLABEL, prov_freeform, ACTIVEFROM from FileMetadata where datasetversion_id = "+version.getId() + " ORDER BY LABEL").getResultList();
 
         for (Object[] result : metadataResults) {
             Integer filemeta_id = (Integer) result[0];
@@ -883,6 +883,12 @@ private List<FileMetadata> retrieveFileMetadataForVersion(Dataset dataset, Datas
             if (provFreeForm != null){
                 fileMetadata.setProvFreeForm(provFreeForm);
             }
+
+            Date activeFrom = (Date) result[7];
+
+            if (activeFrom != null) {
+                fileMetadata.setActiveFrom(activeFrom);
+            }
 
             retList.add(fileMetadata);
         }