Merge pull request #3954 from IQSS/3952-fix-original-type

kcondon · web-flow · commit 7f4309b5aeb2 · 2017-06-23T14:39:11.000-04:00
properly preserving the original type #3952
diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
@@ -775,7 +775,7 @@ public boolean ingestAsTabular(Long datafile_id) { //DataFile dataFile) throws I
                 if (FileUtil.MIME_TYPE_CSV_ALT.equals(dataFile.getContentType())) {
                     tabDataIngest.getDataTable().setOriginalFileFormat(FileUtil.MIME_TYPE_CSV);
                 } else {
-                    tabDataIngest.getDataTable().setOriginalFileFormat(dataFile.getContentType());
+                    tabDataIngest.getDataTable().setOriginalFileFormat(originalContentType);
                 }
 
                 dataFile.setDataTable(tabDataIngest.getDataTable());

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,7 @@ public boolean ingestAsTabular(Long datafile_id) { //DataFile dataFile) throws I`
`775`	`775`	`if (FileUtil.MIME_TYPE_CSV_ALT.equals(dataFile.getContentType())) {`
`776`	`776`	`tabDataIngest.getDataTable().setOriginalFileFormat(FileUtil.MIME_TYPE_CSV);`
`777`	`777`	`} else {`
`778`		`- tabDataIngest.getDataTable().setOriginalFileFormat(dataFile.getContentType());`
	`778`	`+ tabDataIngest.getDataTable().setOriginalFileFormat(originalContentType);`
`779`	`779`	`}`
`780`	`780`
`781`	`781`	`dataFile.setDataTable(tabDataIngest.getDataTable());`