A quick fix for #3305; export and import for file (aka mime) type.

src/main/java/edu/harvard/iq/dataverse/api/imports/ImportDDIServiceBean.java

@@ -9,6 +9,7 @@
 import edu.harvard.iq.dataverse.api.dto.FieldDTO;
 import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO;
 import edu.harvard.iq.dataverse.api.imports.ImportUtil.ImportType;
+import static edu.harvard.iq.dataverse.export.ddi.DdiExportUtil.NOTE_TYPE_CONTENTTYPE;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import java.io.File;
 import java.io.FileInputStream;
@@ -1587,8 +1588,13 @@ private void processOtherMat(XMLStreamReader xmlr, DatasetDTO datasetDTO, Map fi
                         } else if ("id".equalsIgnoreCase(subjectType)) {
                             icpsrId = parseText(xmlr);
                         }
+                    } else if (NOTE_TYPE_CONTENTTYPE.equalsIgnoreCase(noteType)) {
+                        String contentType = parseText(xmlr);
+                        if (!StringUtil.isEmpty(contentType)) {
+                            dfDTO.setContentType(contentType);
+                        }
                     }
-                }
+                } 
             } else if (event == XMLStreamConstants.END_ELEMENT) {// </codeBook>
                 if (xmlr.getLocalName().equals("otherMat")) {
                     // post process
@@ -1652,7 +1658,7 @@ else if (xmlr.getLocalName().equals("notes")) {
                         } else if ("id".equalsIgnoreCase(subjectType)) {
                             icpsrId = parseText(xmlr);
                         }
-                    }
+                    } 
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {// </codeBook>
                 if (xmlr.getLocalName().equals("fileDscr")) {
@@ -1709,22 +1715,30 @@ private String processFileTxt(XMLStreamReader xmlr, FileMetadataDTO fmdDTO, Data
                     fmdDTO.setLabel( parseText(xmlr) );
                     /*sf.setFileType( FileUtil.determineFileType( fmdDTO.getLabel() ) );*/
 
+                } else if (xmlr.getLocalName().equals("fileType")) {
+                    String contentType = parseText(xmlr);
+                    if (!StringUtil.isEmpty(contentType)) {
+                        dfDTO.setContentType(contentType);
+                    }
                 } else if (xmlr.getLocalName().equals("fileCont")) {
                     fmdDTO.setDescription( parseText(xmlr) );
                 }  else if (xmlr.getLocalName().equals("dimensns")) processDimensns(xmlr, dtDTO);
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (xmlr.getLocalName().equals("fileTxt")) {
-                    // Now is the good time to determine the type of this subsettable
-                    // file (now that the "<dimensns>" section has been parsed, we 
-                    // should know whether it's a tab, or a fixed field:
-                    String subsettableFileType = "application/octet-stream"; // better this than nothing!
-                    if ( dtDTO.getRecordsPerCase() != null )  {
-                        subsettableFileType="text/x-fixed-field";
-                    } else {
-                        subsettableFileType="text/tab-separated-values";
-                    }        
+                    // If we still don't know the content type of this file 
+                    // (i.e., if there was no "<fileType>" tag explicitly specifying
+                    // the type), we can try and make an educated guess. We already 
+                    // now that this is a subsettable file. And now that the 
+                    // "<dimensns>" section has been parsed, we can further  
+                    // decide if it's a tab, or a fixed field:
+                    if (StringUtil.isEmpty(dfDTO.getContentType())) {
+                        String subsettableFileType = "text/tab-separated-values";
+                        if (dtDTO.getRecordsPerCase() != null) {
+                            subsettableFileType = "text/x-fixed-field";
+                        }
+                    }
                     //EMK TODO: ask Gustavo & Leonid what should be used here instead of setFileType
-              //      dfDTO.setFileType( subsettableFileType );
+                    // dfDTO.setFileType( subsettableFileType );
 
                     return ddiFileId;
                 }

src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java

@@ -51,6 +51,9 @@
 public class DdiExportUtil {
 
     private static final Logger logger = Logger.getLogger(DdiExportUtil.class.getCanonicalName());
+
+    public static final String NOTE_TYPE_CONTENTTYPE = "DATAVERSE:CONTENTTYPE";
+    public static final String NOTE_SUBJECT_CONTENTTYPE = "Content/MIME Type";
 
     public static String datasetDtoAsJson2ddi(String datasetDtoAsJson) {
         logger.fine(JsonUtil.prettyPrint(datasetDtoAsJson));
@@ -1049,6 +1052,18 @@ private static void createOtherMats(XMLStreamWriter xmlw, List<FileDTO> fileDtos
                 xmlw.writeCharacters(fileDTo.getDataFile().getFilename());
                 xmlw.writeEndElement(); // labl
                 writeFileDescription(xmlw, fileDTo);
+                // there's no readily available field in the othermat section 
+                // for the content type (aka mime type); so we'll store it in this
+                // specially formatted notes section:
+                String contentType = fileDTo.getDataFile().getContentType();
+                if (!StringUtilisEmpty(contentType)) {
+                    xmlw.writeStartElement("notes");
+                    writeAttribute(xmlw, "level", LEVEL_FILE);
+                    writeAttribute(xmlw, "type", NOTE_TYPE_CONTENTTYPE);
+                    writeAttribute(xmlw, "subject", NOTE_SUBJECT_CONTENTTYPE);
+                    xmlw.writeCharacters(contentType);
+                    xmlw.writeEndElement(); // notes
+                }
                 xmlw.writeEndElement(); // otherMat
             }
         }
@@ -1085,6 +1100,18 @@ private static void createOtherMatsFromFileMetadatas(XMLStreamWriter xmlw, List<
                     xmlw.writeCharacters(description);
                     xmlw.writeEndElement(); // txt
                 }
+                // there's no readily available field in the othermat section 
+                // for the content type (aka mime type); so we'll store it in this
+                // specially formatted notes section:
+                String contentType = fileMetadata.getDataFile().getContentType();
+                if (!StringUtilisEmpty(contentType)) {
+                    xmlw.writeStartElement("notes");
+                    writeAttribute(xmlw, "level", LEVEL_FILE);
+                    writeAttribute(xmlw, "type", NOTE_TYPE_CONTENTTYPE);
+                    writeAttribute(xmlw, "subject", NOTE_SUBJECT_CONTENTTYPE);
+                    xmlw.writeCharacters(contentType);
+                    xmlw.writeEndElement(); // notes
+                }
                 xmlw.writeEndElement(); // otherMat
             }
         }