Skip to content

U
uniset2
Commit ef9dbc21 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

Configuration: cleanup code

parent 08a0a0f9
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
src/Various/Configuration.cc
View file @ ef9dbc21
...@@ -227,7 +227,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv ) ...@@ -227,7 +227,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
try try
{ {
if( unixml.getProp(cnode,"idfromfile").empty() || unixml.getIntProp(cnode,"idfromfile")==0 ) if( unixml.getIntProp(cnode,"idfromfile") == 0 )
oind = new ObjectIndex_XML(unixml); //(fileConfName); oind = new ObjectIndex_XML(unixml); //(fileConfName);
else else
oind = new ObjectIndex_idXML(unixml); //(fileConfName); oind = new ObjectIndex_idXML(unixml); //(fileConfName);
...@@ -247,7 +247,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv ) ...@@ -247,7 +247,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
mi = new DefaultMessageInterface(); mi = new DefaultMessageInterface();
else else
{ {
if( unixml.getProp(cnode,"idfromfile").empty() || unixml.getIntProp(cnode,"idfromfile")==0 ) if( unixml.getIntProp(cnode,"idfromfile") == 0 )
mi = new MessageInterface_XML(unixml); // (fileConfName); mi = new MessageInterface_XML(unixml); // (fileConfName);
else else
mi = new MessageInterface_idXML(unixml); // (fileConfName); mi = new MessageInterface_idXML(unixml); // (fileConfName);
...@@ -279,15 +279,15 @@ void Configuration::initConfiguration( int argc, const char* const* argv ) ...@@ -279,15 +279,15 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
// localIOR // localIOR
// localIOR = false; // ??. initParameters() // localIOR = false; // ??. initParameters()
string lior( getArgParam("--localIOR") ); int lior = getArgInt("--localIOR");
if( !lior.empty() ) if( lior )
localIOR = uni_atoi(lior); localIOR = lior;
// transientIOR // transientIOR
// transientIOR = false; // ??. initParameters() // transientIOR = false; // ??. initParameters()
string tior( getArgParam("--transientIOR") ); int tior = getArgInt("--transientIOR");
if( !tior.empty() ) if( tior )
transientIOR = uni_atoi(tior); transientIOR = tior;
if( imagesDir[0]!='/' && imagesDir[0]!='.' ) if( imagesDir[0]!='/' && imagesDir[0]!='.' )
imagesDir = dataDir + imagesDir + "/"; imagesDir = dataDir + imagesDir + "/";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment