Changes in src/Actions/WorldAction/InputAction.cpp [6f5dfe:bd2390]

File:

• src/Actions/WorldAction/InputAction.cpp (modified) (1 diff)

src/Actions/WorldAction/InputAction.cpp

@@ -49 +49 @@
 
   DoLog(0) && (Log() << Verbose(0) << "Config file given " << params.filename << "." << endl);
+  // using the filename as prefix for all parsers
+  std::string FilenameSuffix;
+  std::string FilenamePrefix;
+  if (params.filename.has_filename()) {
+    // get suffix
+    FilenameSuffix = params.filename.extension().substr(1); // remove the prefixed "."
+    FilenamePrefix = params.filename.stem();
+    DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
+    FormatParserStorage::getInstance().SetOutputPrefixForAll(FilenamePrefix);
+  } else {
+    DoeLog(1) && (eLog() << Verbose(1) << "Input file does not have a suffix, cannot recognize format." << endl);
+    return Action::failure;
+  }
+
+  // parsing file if present
   if (!boost::filesystem::exists(params.filename)) {
     DoLog(1) && (Log() << Verbose(1) << "Specified config file " << params.filename << " not found." << endl);
-    return Action::failure;
+    // DONT FAIL: it's just empty and we use the name. // return Action::failure;
   } else {
     DoLog(1) && (Log() << Verbose(1) << "Specified config file found, parsing ... ");
-    if (params.filename.has_filename()) {
-      // get suffix
-      std::string FilenameSuffix = params.filename.extension();
-      std::string FilenamePrefix = params.filename.stem();
-      DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
-      FormatParserStorage::getInstance().SetOutputPrefixForAll(FilenamePrefix);
 
-      // parse the file
-      test.open(params.filename);
-      FormatParserStorage::getInstance().get(test, FilenameSuffix);
-      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(params.filename.substr(0,params.filename.find('.')).c_str());
-      return Action::success;
-    } else {
-      DoeLog(1) && (eLog() << Verbose(1) << "Input file does not have a suffix, cannot recognize format." << endl);
-      return Action::failure;
-    }
+    // parse the file
+    test.open(params.filename);
+    FormatParserStorage::getInstance().get(test, FilenameSuffix);
+    test.close();
+
+    // set file name of last molecule
+    MoleculeList::const_iterator iter = World::getInstance().getMolecules()->ListOfMolecules.end();
+    iter--;
+    (*iter)->SetNameFromFilename(FilenamePrefix.c_str());
   }
+  return Action::success;
 }