Changes in src/Actions/WorldAction/InputAction.cpp [ce7fdc:091838]

File:

• src/Actions/WorldAction/InputAction.cpp (modified) (5 diffs)

src/Actions/WorldAction/InputAction.cpp

@@ -22 +22 @@
 #include "CodePatterns/Log.hpp"
 #include "molecule.hpp"
+#include "MoleculeListClass.hpp"
 #include "Parser/FormatParserStorage.hpp"
 #include "CodePatterns/Verbose.hpp"
@@ -43 +44 @@
 //  molecule *mol = NULL;
   boost::filesystem::ifstream test;
+  FormatParserStorage &parsers = FormatParserStorage::getInstance();
 
   // obtain information
@@ -61 +63 @@
 #endif
     DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
-    FormatParserStorage::getInstance().SetOutputPrefixForAll(FilenamePrefix);
+    parsers.SetOutputPrefixForAll(FilenamePrefix);
   } else {
     DoeLog(1) && (eLog() << Verbose(1) << "Input file does not have a suffix, cannot recognize format." << endl);
@@ -71 +73 @@
     DoLog(1) && (Log() << Verbose(1) << "Specified config file " << params.filename << " not found." << endl);
     // DONT FAIL: it's just empty and we use the name. // return Action::failure;
+    // nonetheless, add to output formats
+    parsers.setOutputFormat( parsers.getTypeFromSuffix(FilenameSuffix) );
   } else {
     DoLog(1) && (Log() << Verbose(1) << "Specified config file found, parsing ... ");
@@ -76 +80 @@
     // parse the file
     test.open(params.filename);
-    FormatParserStorage::getInstance().load(test, FilenameSuffix);
+    parsers.load(test, FilenameSuffix);
+    parsers.setOutputFormat( parsers.getTypeFromSuffix(FilenameSuffix) );
     test.close();