Merge pull request #197 from peastman/pdbx

Added option to save files in PDBx/mmCIF format

pdbfixer/html/saveFile.html

 The fixed PDB file is ready to save.
 The fixed PDB file is ready to save.
 <p>
 <p>
 <form method="post" action="/">
 <form method="post" action="/">
-<input type="submit" name="save" value="Save File"/>
+<input type="submit" name="pdb" value="Save PDB File"/>
+<input type="submit" name="pdbx" value="Save PDBx/mmCIF File"/>
 <input type="submit" name="newfile" value="Process Another File"/>
 <input type="submit" name="newfile" value="Process Another File"/>
 </form>
 </form>
 <script>
 <script>

pdbfixer/ui.py

@@ -138,7 +138,7 @@ def addHydrogensPageCallback(parameters, handler):
     displaySaveFilePage()
     displaySaveFilePage()
 
 
 def saveFilePageCallback(parameters, handler):
 def saveFilePageCallback(parameters, handler):
-    if 'save' in parameters:
+    if 'pdb' in parameters:
         output = StringIO()
         output = StringIO()
         if fixer.source is not None:
         if fixer.source is not None:
             output.write("REMARK   1 PDBFIXER FROM: %s\n" % fixer.source)
             output.write("REMARK   1 PDBFIXER FROM: %s\n" % fixer.source)
@@ -147,6 +147,15 @@ def saveFilePageCallback(parameters, handler):
         except AssertionError:
         except AssertionError:
             print
             print
         handler.sendDownload(output.getvalue(), 'output.pdb')
         handler.sendDownload(output.getvalue(), 'output.pdb')
+    elif 'pdbx' in parameters:
+        output = StringIO()
+        if fixer.source is not None:
+            output.write("# Created with PDBFixer from: %s\n" % fixer.source)
+        try:
+            app.PDBxFile.writeFile(fixer.topology, fixer.positions, output, True)
+        except AssertionError:
+            print
+        handler.sendDownload(output.getvalue(), 'output.cif')
     else:
     else:
         displayStartPage()
         displayStartPage()