Changeset 15111 for trunk

Timestamp:

03/18/13 16:43:51 (12 years ago)

Author:

tbretz

Message:

The name of the program has to be extracted from conf.GetName()

Location:

trunk/FACT++/src

Files:

• StateMachineDimControl.cc (modified) (2 diffs)
• dimctrl.cc (modified) (3 diffs)

trunk/FACT++/src/StateMachineDimControl.cc

@@ -1 +1 @@
 #include "StateMachineDimControl.h"
+
+#include <boost/filesystem.hpp>
 
 #include "Dim.h"
@@ -546 +548 @@
     //     fVerbosity = 90;
 
-    if (conf.GetName()=="dimserver")
+    const boost::filesystem::path path(conf.GetName());
+    const string fname = path.filename().string();
+
+    if (fname=="dimserver")
         return -1;
 

trunk/FACT++/src/dimctrl.cc

@@ -11 +11 @@
 int RunShell(Configuration &conf)
 {
-    StateMachineDimControl::fIsServer = conf.GetName()=="dimserver";
+    const boost::filesystem::path path(conf.GetName());
+    const string fname = path.filename().string();
+
+    StateMachineDimControl::fIsServer = fname=="dimserver";
     return Main::execute<T, StateMachineDimControl>(conf);
 }
@@ -17 +20 @@
 void SetupConfiguration(Configuration &conf)
 {
-    po::options_description control("Options ("+conf.GetName()+")");
+    const boost::filesystem::path path(conf.GetName());
+    const string fname = path.filename().string();
+
+    po::options_description control("Options ("+fname+")");
     control.add_options()
         ("force-console", po_switch(),     "Forces console mode in server-mode.")
         ("debug",         po_bool(false),  "Print the labels for debugging purpose")
         ("user,u",        var<string>(""), "A user name - just for logging purposes (default is ${USER})")
-        ("JavaScript.*",  var<string>(""), "Additional arguments which are provided to JavaScripts started in a dimctrl server via the START command")
+        ("JavaScript.*",  var<string>(),   "Additional arguments which are provided to JavaScripts started in a dimctrl server via the START command")
         ;
 
-    if (conf.GetName()!="dimserver")
+    if (fname!="dimserver")
     {
         control.add_options()
@@ -102 +108 @@
         throw runtime_error("--force-console must be used with --console/-c");
 
-    if (conf.GetName()=="dimserver" && !conf.Get<bool>("force-console"))
+    const boost::filesystem::path path(conf.GetName());
+    const string fname = path.filename().string();
+
+    if (fname=="dimserver" && !conf.Get<bool>("force-console"))
         conf.Remove("console");