Skip to content

Commit 22f7c29

Browse files
committed
Use proper names for DLD files start/stop/restart in web interface
1 parent 4afbe55 commit 22f7c29

File tree

1 file changed

+15
-19
lines changed

1 file changed

+15
-19
lines changed

plugins/dogma/src/CombinerModule.cxx

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@ dogma::CombinerModule::CombinerModule(const std::string &name, dabc::Command cmd
165165
CreateCmdDef("BnetCalibrControl").SetField("_hidden", true);
166166
CreateCmdDef("BnetCalibrRefresh").SetField("_hidden", true);
167167
} else {
168-
CreateCmdDef("StartHldFile")
169-
.AddArg("filename", "string", true, "file.hld")
168+
CreateCmdDef("StartDldFile")
169+
.AddArg("filename", "string", true, "file.dld")
170170
.AddArg(dabc::xml_maxsize, "int", false, 1500)
171-
.SetArgMinMax(dabc::xml_maxsize, 1, 5000);
172-
CreateCmdDef("StopHldFile");
173-
CreateCmdDef("RestartHldFile");
171+
.SetArgMinMax(dabc::xml_maxsize, 1, 50000);
172+
CreateCmdDef("StopDldFile");
173+
CreateCmdDef("RestartDldFile");
174174
}
175175

176176
CreatePar(fInfoName, "info").SetSynchron(true, 2., false).SetDebugLevel(2);
@@ -1544,19 +1544,15 @@ int dogma::CombinerModule::ExecuteCommand(dabc::Command cmd)
15441544
{
15451545
bool do_start = false, do_stop = false;
15461546

1547-
if (cmd.IsName("StartDogmaFile")) {
1547+
if (cmd.IsName("StartDldFile")) {
15481548
do_start = do_stop = true;
1549-
SetInfo("Execute StartDogmaFile");
1550-
1551-
DOUT0("******************* START DOGMA FILE *************");
1552-
} else if (cmd.IsName("StopDogmaFile")) {
1549+
SetInfo("Execute StartDldFile");
1550+
} else if (cmd.IsName("StopDldFile")) {
15531551
do_stop = true;
1554-
SetInfo("Execute StopDogmaFile");
1555-
DOUT0("******************* STOP DOGMA FILE *************");
1556-
1557-
} else if (cmd.IsName("RestartDogmaFile")) {
1552+
SetInfo("Execute StopDldFile");
1553+
} else if (cmd.IsName("RestartDldFile")) {
15581554
if (NumOutputs() < 2) return dabc::cmd_false;
1559-
SetInfo("Execute RestartDogmaFile");
1555+
SetInfo("Execute RestartDldFile");
15601556
cmd.ChangeName("RestartTransport");
15611557
SubmitCommandToTransport(OutputName(1), cmd);
15621558
return dabc::cmd_postponed;
@@ -1696,21 +1692,21 @@ int dogma::CombinerModule::ExecuteCommand(dabc::Command cmd)
16961692
if (NumOutputs() > 1)
16971693
res = DisconnectPort(OutputName(1));
16981694

1699-
DOUT0("Stop HLD file res = %s", DBOOL(res));
1695+
DOUT0("Stop DLD file res = %s", DBOOL(res));
17001696
}
17011697

17021698
if (do_start && res) {
1703-
std::string fname = cmd.GetStr("filename", "file.dogma");
1699+
std::string fname = cmd.GetStr("filename", "file.dld");
17041700
int maxsize = cmd.GetInt(dabc::xml_maxsize, 1500);
17051701

1706-
std::string url = dabc::format("dogma://%s?%s=%d", fname.c_str(), dabc::xml_maxsize, maxsize);
1702+
std::string url = dabc::format("dld://%s?%s=%d", fname.c_str(), dabc::xml_maxsize, maxsize);
17071703

17081704
// we guarantee, that at least two ports will be created
17091705
EnsurePorts(0, 2);
17101706

17111707
res = dabc::mgr.CreateTransport(OutputName(1, true), url);
17121708

1713-
DOUT0("Start HLD file %s res = %s", fname.c_str(), DBOOL(res));
1709+
DOUT0("Start DLD file %s res = %s", fname.c_str(), DBOOL(res));
17141710
}
17151711

17161712
return cmd_bool(res);

0 commit comments

Comments
 (0)