Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-01 14:20:11 +01:00
Code Issues Projects Releases Wiki Activity

2025-11-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'RDCart::updateLength()' that could throw a SQL
	error.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2025-11-26 12:12:35 -05:00
parent 187a69c5fd
commit 306633e86c
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -25073,3 +25073,6 @@
flag set. flag set.
2025-11-24 Fred Gleason <fredg@paravelsystems.com> 2025-11-24 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 4.4.1int1. * Incremented the package version to 4.4.1int1.
2025-11-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'RDCart::updateLength()' that could throw a SQL
error.

23
lib/rdcart.cpp
View File

@@ -1080,30 +1080,19 @@ void RDCart::updateLength(bool enforce_length,unsigned length)
"`CART`.`TYPE`,"+ // 00 "`CART`.`TYPE`,"+ // 00
"`CART`.`TITLE` "+ // 01 "`CART`.`TITLE` "+ // 01
"from `CART` where "+ "from `CART` where "+
QString::asprintf("NUMBER=%u",cart_number); QString::asprintf("`NUMBER`=%u",cart_number);
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
cart_type=(RDCart::Type)q->value(0).toInt(); cart_type=(RDCart::Type)q->value(0).toInt();
cart_title=q->value(1).toString(); cart_title=q->value(1).toString();
} }
else {
rda->syslog(LOG_WARNING,"attempted to update non-existent cart \"%06u\"",
cart_number);
delete q; delete q;
if(cart_type==RDCart::All) { // Should never happen!
sql=QString("update `CART` set ")+
QString::asprintf("`CART`.`VALIDITY`=%u,",RDCart::NeverValid)+
"`CART`.`START_DATETIME`=NULL,"+
"`CART`.`END_DATETIME`=NULL,"+
"`CART`.`AVERAGE_LENGTH`=0,"+
"`CART`.`AVERAGE_SEGUE_LENGTH`=0,"+
"`CART`.`AVERAGE_HOOK_LENGTH`=0,"+
"`CART`.`MINIMUM_TALK_LENGTH`=0,"+
"`CART`.`MAXIMUM_TALK_LENGTH`=0 "+
QString::asprintf(" where `CART_NUMBER`=%u",cart_number);
RDSqlQuery::apply(sql);
rda->syslog(LOG_WARNING,"cart %06u [%s] has ambiguous type",
cart_number,cart_title.toUtf8().constData());
return; return;
} }
delete q;
if(cart_type==RDCart::Macro) { if(cart_type==RDCart::Macro) {
RDMacroEvent *macro_evt=new RDMacroEvent(rda->ripc(),NULL); RDMacroEvent *macro_evt=new RDMacroEvent(rda->ripc(),NULL);
sql=QString("update `CART` set ")+ sql=QString("update `CART` set ")+
@@ -1115,7 +1104,7 @@ void RDCart::updateLength(bool enforce_length,unsigned length)
"`CART`.`AVERAGE_HOOK_LENGTH`=0,"+ "`CART`.`AVERAGE_HOOK_LENGTH`=0,"+
"`CART`.`MINIMUM_TALK_LENGTH`=0,"+ "`CART`.`MINIMUM_TALK_LENGTH`=0,"+
"`CART`.`MAXIMUM_TALK_LENGTH`=0 "+ "`CART`.`MAXIMUM_TALK_LENGTH`=0 "+
QString::asprintf(" where `CART_NUMBER`=%u",cart_number); QString::asprintf(" where `CART`.`NUMBER`=%u",cart_number);
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);
delete macro_evt; delete macro_evt;
return; return;