JAL-2344 use ".cif" for saved mmCIF file (and refactor fetch as file)

[jalview.git] / src / jalview / ws / dbsources / Pdb.java

diff --git a/src/jalview/ws/dbsources/Pdb.java b/src/jalview/ws/dbsources/Pdb.java
index 68dda88..982c399 100644 (file)
--- a/src/jalview/ws/dbsources/Pdb.java
+++ b/src/jalview/ws/dbsources/Pdb.java
@@ -38,6 +38,7 @@ import jalview.structure.StructureImportSettings;
 import jalview.util.MessageManager;
 import jalview.ws.ebi.EBIFetchClient;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -141,12 +142,19 @@ public class Pdb extends EbiFileRetrievedProxy
       stopQuery();
       return null;
     }
+
+    /*
+     * ensure that an mmCIF format structure file is saved with extension.cif,
+     * because the Chimera "open" command recognises this extension
+     */
     Type pdbFileFormat = StructureImportSettings
             .getDefaultStructureFileFormat();
-    String ext = "." + pdbFileFormat.getExtension();
+    String ext = pdbFileFormat.getExtension();
+    String fetchFormat = pdbFileFormat.getFormat();
+
     EBIFetchClient ebi = new EBIFetchClient();
-    file = ebi.fetchDataAsFile("pdb:" + id, pdbFileFormat.getFormat(), ext)
-            .getAbsolutePath();
+    File tmpFile = ebi.fetchDataAsFile("pdb:" + id, fetchFormat, ext);
+    file = tmpFile.getAbsolutePath();
     stopQuery();
     if (file == null)
     {
@@ -155,8 +163,7 @@ public class Pdb extends EbiFileRetrievedProxy
     try
     {
       // todo get rid of Type and use FileFormatI instead?
-      // todo get rid of "ext" and just use "tmp"?
-      FileFormatI fileFormat = pdbFileFormat == Type.PDB ? FileFormat.PDB
+      FileFormatI fileFormat = (pdbFileFormat == Type.PDB) ? FileFormat.PDB
               : FileFormat.MMCif;
       pdbAlignment = new FormatAdapter().readFile(file,
               DataSourceType.FILE, fileFormat);