Changes in src/Actions/WorldAction/InputAction.cpp [86cff86:4f7f34e]

File:

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

src/Actions/WorldAction/InputAction.cpp

@@ -38 +38 @@
   MoleculeListClass *molecules = World::getInstance().getMolecules();
   molecule *mol = NULL;
-  std::string filename;
+  string filename;
   std::ifstream test;
 
@@ -45 +45 @@
   if(dialog->display()) {
     DoLog(0) && (Log() << Verbose(0) << "Config file given." << endl);
-    if (filename.find('.') != string::npos) {
-      std::string FilenamePrefix = filename.substr(0,filename.find_last_of('.'));
-      std::string FilenameSuffix = filename.substr(filename.find_last_of('.')+1, filename.length());
-      DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
-      test.open(filename.c_str());
-      if (test == NULL) {
-        DoLog(1) && (Log() << Verbose(1) << "Specified config file " << filename << " not found." << endl);
-      } else {
-        DoLog(1) && (Log() << Verbose(1) << "Specified config file found, parsing ... ");
-        FormatParserStorage::getInstance().get((std::istream &)test, FilenameSuffix);
-        test.close();
-      }
-      FormatParserStorage::getInstance().SetOutputPrefixForAll(FilenamePrefix);
-      // set mol to first active molecule
-      if (molecules->ListOfMolecules.size() != 0) {
-        for (MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
-          if ((*ListRunner)->ActiveFlag) {
-            mol = *ListRunner;
-            break;
-          }
-      }
-      if (mol == NULL) {
-        mol = World::getInstance().createMolecule();
-        mol->ActiveFlag = true;
-        molecules->insert(mol);
-      }
-      mol->SetNameFromFilename(filename.substr(0,filename.find('.')).c_str());
+    std::string FilenamePrefix = filename.substr(0,filename.find('.'));
+    FormatParserStorage::getInstance().SetOutputPrefixForAll(FilenamePrefix);
+    DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
+    test.open(filename.c_str());
+    if (test == NULL) {
+      DoLog(1) && (Log() << Verbose(1) << "Specified config file " << filename << " not found." << endl);
     } else {
-      DoeLog(1) && (eLog() << Verbose(1) << "Input file does not have a suffix, cannot recognize format." << endl);
+      DoLog(1) && (Log() << Verbose(1) << "Specified config file found, parsing ... ");
+      FormatParserStorage::getInstance().getPcp().load(&test);
+      test.close();
     }
+    // set mol to first active molecule
+    if (molecules->ListOfMolecules.size() != 0) {
+      for (MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
+        if ((*ListRunner)->ActiveFlag) {
+          mol = *ListRunner;
+          break;
+        }
+    }
+    if (mol == NULL) {
+      mol = World::getInstance().createMolecule();
+      mol->ActiveFlag = true;
+      molecules->insert(mol);
+    }
+    mol->SetNameFromFilename(filename.c_str());
     delete dialog;
     return Action::success;