Changeset 15087 for trunk/FACT++

Timestamp:

03/18/13 14:36:32 (12 years ago)

Author:

tbretz

Message:

Send arguments with the START command, determine '--server' option from the program name.

File:

• trunk/FACT++/src/StateMachineDimControl.cc (modified) (2 diffs)

trunk/FACT++/src/StateMachineDimControl.cc

@@ -546 +546 @@
     //     fVerbosity = 90;
 
-    const int cnt = conf.Get<bool>("stop")+conf.Has("start")+conf.Has("batch");
-
-    if (fIsServer)
-    {
-        if (cnt>0)
-        {
-            Error("--start, --batch, --stop are mutually exclusive to --server.");
-            return 3;
-        }
+    if (conf.GetName()=="dimserver")
         return -1;
-    }
-
-    if (cnt>1)
-    {
-        Error("--start, --batch and --stop are all mutually exclusive.");
-        return 4;
-    }
 
     if (conf.Get<bool>("stop"))
@@ -568 +553 @@
 
     if (conf.Has("start"))
-        return !Dim::SendCommand("DIM_CONTROL/START", conf.Get<string>("start")+" user='"+fUser+"'");
+        return !Dim::SendCommand("DIM_CONTROL/START", conf.Get<string>("start")+" user='"+fUser+"'"+fArgumentsJS);
 
     if (conf.Has("batch"))