Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/WorldAction/InputAction.cpp

    r6f5dfe rbd2390  
    4949
    5050  DoLog(0) && (Log() << Verbose(0) << "Config file given " << params.filename << "." << endl);
     51  // using the filename as prefix for all parsers
     52  std::string FilenameSuffix;
     53  std::string FilenamePrefix;
     54  if (params.filename.has_filename()) {
     55    // get suffix
     56    FilenameSuffix = params.filename.extension().substr(1); // remove the prefixed "."
     57    FilenamePrefix = params.filename.stem();
     58    DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
     59    FormatParserStorage::getInstance().SetOutputPrefixForAll(FilenamePrefix);
     60  } else {
     61    DoeLog(1) && (eLog() << Verbose(1) << "Input file does not have a suffix, cannot recognize format." << endl);
     62    return Action::failure;
     63  }
     64
     65  // parsing file if present
    5166  if (!boost::filesystem::exists(params.filename)) {
    5267    DoLog(1) && (Log() << Verbose(1) << "Specified config file " << params.filename << " not found." << endl);
    53     return Action::failure;
     68    // DONT FAIL: it's just empty and we use the name. // return Action::failure;
    5469  } else {
    5570    DoLog(1) && (Log() << Verbose(1) << "Specified config file found, parsing ... ");
    56     if (params.filename.has_filename()) {
    57       // get suffix
    58       std::string FilenameSuffix = params.filename.extension();
    59       std::string FilenamePrefix = params.filename.stem();
    60       DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
    61       FormatParserStorage::getInstance().SetOutputPrefixForAll(FilenamePrefix);
    6271
    63       // parse the file
    64       test.open(params.filename);
    65       FormatParserStorage::getInstance().get(test, FilenameSuffix);
    66       test.close();
    67 //
    68 //      // set mol to first active molecule
    69 //      if (molecules->ListOfMolecules.size() != 0) {
    70 //        for (MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
    71 //          if ((*ListRunner)->ActiveFlag) {
    72 //            mol = *ListRunner;
    73 //            break;
    74 //          }
    75 //      }
    76 //      if (mol == NULL) {
    77 //        mol = World::getInstance().createMolecule();
    78 //        mol->ActiveFlag = true;
    79 //        molecules->insert(mol);
    80 //      }
    81 //      mol->SetNameFromFilename(params.filename.substr(0,params.filename.find('.')).c_str());
    82       return Action::success;
    83     } else {
    84       DoeLog(1) && (eLog() << Verbose(1) << "Input file does not have a suffix, cannot recognize format." << endl);
    85       return Action::failure;
    86     }
     72    // parse the file
     73    test.open(params.filename);
     74    FormatParserStorage::getInstance().get(test, FilenameSuffix);
     75    test.close();
     76
     77    // set file name of last molecule
     78    MoleculeList::const_iterator iter = World::getInstance().getMolecules()->ListOfMolecules.end();
     79    iter--;
     80    (*iter)->SetNameFromFilename(FilenamePrefix.c_str());
    8781  }
     82  return Action::success;
    8883}
    8984
Note: See TracChangeset for help on using the changeset viewer.