Changeset 15087


Ignore:
Timestamp:
03/18/13 14:36:32 (9 years ago)
Author:
tbretz
Message:
Send arguments with the START command, determine '--server' option from the program name.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/StateMachineDimControl.cc

    r15041 r15087  
    546546    //     fVerbosity = 90;
    547547
    548     const int cnt = conf.Get<bool>("stop")+conf.Has("start")+conf.Has("batch");
    549 
    550     if (fIsServer)
    551     {
    552         if (cnt>0)
    553         {
    554             Error("--start, --batch, --stop are mutually exclusive to --server.");
    555             return 3;
    556         }
     548    if (conf.GetName()=="dimserver")
    557549        return -1;
    558     }
    559 
    560     if (cnt>1)
    561     {
    562         Error("--start, --batch and --stop are all mutually exclusive.");
    563         return 4;
    564     }
    565550
    566551    if (conf.Get<bool>("stop"))
     
    568553
    569554    if (conf.Has("start"))
    570         return !Dim::SendCommand("DIM_CONTROL/START", conf.Get<string>("start")+" user='"+fUser+"'");
     555        return !Dim::SendCommand("DIM_CONTROL/START", conf.Get<string>("start")+" user='"+fUser+"'"+fArgumentsJS);
    571556
    572557    if (conf.Has("batch"))
Note: See TracChangeset for help on using the changeset viewer.