2018-07-31 Fred Gleason <fredg@paravelsystems.com>

* Refactored 'RDMacro' to handle UTF-8 strings correctly.
This commit is contained in:
Fred Gleason
2018-07-31 12:54:08 -04:00
parent dbb0d9c415
commit 26c29e1d4e
47 changed files with 676 additions and 686 deletions

View File

@@ -64,7 +64,7 @@ void MainObject::rmlReceivedData(RDMacro *rml)
rml->arg(0).toInt()));
}
else { // Load Log
logname=rml->arg(1).toString();
logname=rml->arg(1);
if(!RDLog::exists(logname)) {
if(rml->echoRequested()) {
rml->acknowledge(false);
@@ -157,7 +157,7 @@ void MainObject::rmlReceivedData(RDMacro *rml)
}
return;
}
logname=rml->arg(1).toString();
logname=rml->arg(1);
if(!RDLog::exists(logname)) {
if(rml->echoRequested()) {
rml->acknowledge(false);
@@ -562,8 +562,8 @@ void MainObject::rmlReceivedData(RDMacro *rml)
}
return;
}
if((rml->arg(0).toString().lower()!="now")&&
(rml->arg(0).toString().lower()!="next")) {
if((rml->arg(0).lower()!="now")&&
(rml->arg(0).lower()!="next")) {
if(rml->echoRequested()) {
rml->acknowledge(false);
rda->ripc()->sendRml(rml);
@@ -584,7 +584,7 @@ void MainObject::rmlReceivedData(RDMacro *rml)
}
return;
}
if(rml->arg(0).toString().lower()=="now") {
if(rml->arg(0).lower()=="now") {
air_logs[index]->setNowCart(rml->arg(2).toUInt());
rda->log(RDConfig::LogInfo,QString().
sprintf("set default \"now\" cart to %06u on log machine %d",

View File

@@ -281,9 +281,8 @@ void MainObject::ripcConnectedData(bool state)
q=new RDSqlQuery(sql);
if(q->first()) {
rml.setCommand(RDMacro::LL); // Load Log
rml.setArgQuantity(2);
rml.setArg(0,mach+1);
rml.setArg(1,air_start_lognames[i]);
rml.addArg(mach+1);
rml.addArg(air_start_lognames[i]);
rda->ripc()->sendRml(&rml);
}
else {
@@ -321,15 +320,17 @@ void MainObject::logReloadedData(int log)
if(air_start_lines[log]<air_logs[log]->size()) {
rml.setCommand(RDMacro::MN); // Make Next
rml.setArgQuantity(2);
rml.setArg(0,mach+1);
rml.setArg(1,air_start_lines[log]);
rml.addArg(mach+1);
rml.addArg(air_start_lines[log]);
rda->ripc()->sendRml(&rml);
if(air_start_starts[log]) {
rml.clear();
rml.setRole(RDMacro::Cmd);
rml.setAddress(addr);
rml.setEchoRequested(false);
rml.setCommand(RDMacro::PN); // Start Next
rml.setArgQuantity(1);
rml.setArg(0,mach+1);
rml.addArg(mach+1);
rda->ripc()->sendRml(&rml);
}
}