From 4af45aa3a70c190fd458b97849241cfb28e97ee1 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 3 Aug 2022 11:14:45 -0400 Subject: [PATCH] 2022-08-03 Fred Gleason * Modified the endpoint naming format for Software Authority Protocol devices to match that used in Drouter. Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ ripcd/swauthority.cpp | 14 ++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ab082ef..3b526528 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23208,3 +23208,6 @@ 2022-08-03 Fred Gleason * Fixed a bug in rdcatch(1) that could cause a newly added event to appear twice in the record list. +2022-08-03 Fred Gleason + * Modified the endpoint naming format for Software Authority + Protocol devices to match that used in Drouter. diff --git a/ripcd/swauthority.cpp b/ripcd/swauthority.cpp index 929965f2..053b7f5f 100644 --- a/ripcd/swauthority.cpp +++ b/ripcd/swauthority.cpp @@ -339,7 +339,7 @@ void SoftwareAuthority::DispatchCommand() // while(f0[0].toInt()>swa_next_endpt) { sql=QString("insert into `INPUTS` set ")+ - "`NAME`='"+tr("[none]")+"',"+ + "`NAME`='"+QString::asprintf("%d - ",swa_next_endpt)+tr("[none]")+"',"+ "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"',"+ QString::asprintf("`MATRIX`=%d,",swa_matrix)+ QString::asprintf("`NUMBER`=%d",swa_next_endpt); @@ -350,10 +350,7 @@ void SoftwareAuthority::DispatchCommand() // // Process the actual entry // - name=f0[1]; - if(f0.size()>=7) { - name=f0[6]+": "+f0[2]; - } + name=QString::asprintf("%d - ",f0[0].toInt())+f0[2]; sql=QString("insert into `INPUTS` set ")+ "`NAME`='"+RDEscapeString(name)+"',"+ "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"',"+ @@ -399,7 +396,7 @@ void SoftwareAuthority::DispatchCommand() // while(f0[0].toInt()>swa_next_endpt) { sql=QString("insert into `OUTPUTS` set ")+ - "`NAME`='"+tr("[none]")+"',"+ + "`NAME`='"+QString::asprintf("%d - ",swa_next_endpt)+tr("[none]")+"',"+ "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"',"+ QString::asprintf("`MATRIX`=%d,",swa_matrix)+ QString::asprintf("`NUMBER`=%d",swa_next_endpt); @@ -410,10 +407,7 @@ void SoftwareAuthority::DispatchCommand() // // Process the actual entry // - name=f0[1]; - if(f0.size()>=6) { - name=f0[3]+"/"+f0[5]+": "+f0[2]; - } + name=QString::asprintf("%d - ",f0[0].toInt())+f0[2]; sql=QString("insert into `OUTPUTS` set ")+ "`NAME`='"+RDEscapeString(name)+"',"+ "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"',"+