Skip to content

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

small changes

parent ab68d218
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
Utilities/SMonit/smonitor.cc
View file @ d2337fe2
...@@ -24,10 +24,9 @@ int main( int argc, const char **argv ) ...@@ -24,10 +24,9 @@ int main( int argc, const char **argv )
uniset_init(argc,argv,"configure.xml"); uniset_init(argc,argv,"configure.xml");
ObjectId ID(DefaultObjectId); ObjectId ID(DefaultObjectId);
string name = conf->getArgParam("--name"); string name = conf->getArgParam("--name", "TestProc");
if( name.empty() )
name = "TestProc"; ID = conf->getObjectID(name);
ID = conf->getObjectID(name);
if( ID == UniSetTypes::DefaultObjectId ) if( ID == UniSetTypes::DefaultObjectId )
{ {
cerr << "(main): '" << name cerr << "(main): '" << name
......
src/Various/Configuration.cc
View file @ d2337fe2
...@@ -190,7 +190,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv ) ...@@ -190,7 +190,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
char curdir[FILENAME_MAX]; char curdir[FILENAME_MAX];
getcwd(curdir,FILENAME_MAX); getcwd(curdir,FILENAME_MAX);
rootDir = curdir + string("/"); rootDir = string(curdir) + "/";
UniSetTypes::conf = this; UniSetTypes::conf = this;
try try
...@@ -281,13 +281,13 @@ void Configuration::initConfiguration( int argc, const char* const* argv ) ...@@ -281,13 +281,13 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
// localIOR = false; // ??. initParameters() // localIOR = false; // ??. initParameters()
string lior( getArgParam("--localIOR") ); string lior( getArgParam("--localIOR") );
if( !lior.empty() ) if( !lior.empty() )
localIOR = atoi(lior.c_str()); localIOR = uni_atoi(lior);
// transientIOR // transientIOR
// transientIOR = false; // ??. initParameters() // transientIOR = false; // ??. initParameters()
string tior( getArgParam("--transientIOR") ); string tior( getArgParam("--transientIOR") );
if( !tior.empty() ) if( !tior.empty() )
transientIOR = atoi(tior.c_str()); transientIOR = uni_atoi(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