Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-30 23:49:32 +02:00
Code Issues Projects Releases Wiki Activity

Fix a typo in lib/rdcut.cpp that threw a SQL error.

Browse Source 
Fix typos in lib/rdsvc.cpp that threw SQL errors.

Fix typos in rdlibrary/list_reports.cpp that threw SQL errors.

Fix typos in utils/rdclilogedit/operations.cpp that threw SQL errors.

Fix typos in utils/rddbmgr/updateschema.cpp that threw SQL errors.

Signed-off-by: David Klann <dklann@broadcasttool.com>
This commit is contained in:
David Klann 2021-05-09 21:29:45 -05:00
parent 4532bc2760
commit 288fb02fed
6 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -21646,3 +21646,14 @@
* Fixed typos in 'CODINGSTYLE'.
2021-05-07 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 4.0.0beta0.
2021-05-09 David Klann <dklann@broadcasttool.com>
* Fixed typo in 'lib/rdcut.cpp' that caused SQL
errors.
* Fixed typos in 'lib/rdsvc.cpp' that caused SQL
errors.
* Fixed typos in 'rdlibrary/list_reports.cpp' that caused SQL
errors.
* Fixed typos in 'utils/rdclilogedit/operations.cpp' that caused
SQL errors.
* Fixed typos in 'utils/rddbmgr/updateschema.cpp' that caused SQL
errors.

2
lib/rdcut.cpp
View File

@ -1105,7 +1105,7 @@ void RDCut::setMetadata(RDWaveData *data) const
sql+=QString("`ISRC`='")+RDEscapeString(data->isrc().left(12))+"',";
}
if(!data->isci().isEmpty()) {
sql+=QString("`ISCI=`'")+RDEscapeString(data->isci().left(32))+"',";
sql+=QString("`ISCI`='")+RDEscapeString(data->isci().left(32))+"',";
}
if(!data->recordingMbId().isEmpty()) {
sql+=QString("`RECORDING_MBID`='")+

4
lib/rdsvc.cpp
View File

@ -1281,8 +1281,8 @@ bool RDSvc::create(const QString &name,QString *err_msg,
}
else { // Base on Existing Service
sql=QString("select ")+
"`DESCRIPTION,`"+ // 00
"`NAME_TEMPLATE,`"+ // 01
"`DESCRIPTION`,"+ // 00
"`NAME_TEMPLATE`,"+ // 01
"`DESCRIPTION_TEMPLATE`,"+ // 02
"`PROGRAM_CODE`,"+ // 03
"`CHAIN_LOG`,"+ // 04

4
rdlibrary/list_reports.cpp
View File

@ -185,7 +185,7 @@ void ListReports::GenerateCartReport(QString *report)
"`CART`.`LENGTH_DEVIATION`,"+ // 09
"`CART`.`OWNER` "+ // 10
"from `CART` "+
"left join `GROUPS` on `CART`.`GROUP_NAME`=`GROUPS`.`NAME "+
"left join `GROUPS` on `CART`.`GROUP_NAME`=`GROUPS`.`NAME` "+
"left join `CUTS` on `CART`.`NUMBER`=`CUTS`.`CART_NUMBER` ";
sql+=list_filter_sql;
unsigned prev_cartnum=0;
@ -538,7 +538,7 @@ void ListReports::GenerateCartDumpCsv(QString *report,bool prepend_names)
"`CUTS`.`FADEUP_POINT`,"+ // 29
"`CUTS`.`FADEDOWN_POINT` "+ // 30
"from `CART` "+
"left join `GROUPS` on `CART`.`GROUP_NAME`=`GROUPS`.`NAME "+
"left join `GROUPS` on `CART`.`GROUP_NAME`=`GROUPS`.`NAME` "+
"left join `CUTS` on `CART`.`NUMBER`=`CUTS`.`CART_NUMBER` ";
sql+=list_filter_sql;
q=new RDSqlQuery(sql);

4
utils/rdclilogedit/operations.cpp
View File

@ -420,8 +420,8 @@ void MainObject::Saveas(const QString &logname)
RDLog *log=new RDLog(logname);
if(!log->exists()) {
sql=QString("insert into `LOGS` set ")+
"`NAME='"+RDEscapeString(logname)+"',"+
"`TYPE=0,"+
"`NAME`='"+RDEscapeString(logname)+"',"+
"`TYPE`=0,"+
"`DESCRIPTION`='"+RDEscapeString(edit_description)+"',"+
"`ORIGIN_USER`='"+RDEscapeString(rda->user()->name())+"',"+
"`ORIGIN_DATETIME`=now(),"+

10
utils/rddbmgr/updateschema.cpp
View File

@ -378,7 +378,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
"`NUMBER` int not null,"+
"`NAME` char(64),"+
"`FEED_NAME` char(8),"+
"index `MATRIX_IDX` (`STATION_NAME`,`MATRIX,NUMBER`))"+
"index `MATRIX_IDX` (`STATION_NAME`,`MATRIX`,`NUMBER`))"+
" charset latin1 collate latin1_swedish_ci"+
db_table_create_postfix;
if(!RDSqlQuery::apply(sql,err_msg)) {
@ -394,7 +394,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
"`MATRIX` int not null,"+
"`NUMBER` int not null,"+
"`NAME` char(64),"+
"index `MATRIX_IDX` (`STATION_NAME`,`MATRIX,NUMBER`))"+
"index `MATRIX_IDX` (`STATION_NAME`,`MATRIX`,`NUMBER`))"+
" charset latin1 collate latin1_swedish_ci"+
db_table_create_postfix;
if(!RDSqlQuery::apply(sql,err_msg)) {
@ -649,7 +649,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
"`MATRIX` int not null,"+
"`NUMBER` int not null,"+
"`MACRO_CART` int default -1,"+
"index `MATRIX_IDX` (`STATION_NAME`,`MATRIX,NUMBER`))"+
"index `MATRIX_IDX` (`STATION_NAME`,`MATRIX`,`NUMBER`))"+
" charset latin1 collate latin1_swedish_ci"+
db_table_create_postfix;
if(!RDSqlQuery::apply(sql,err_msg)) {
@ -2459,7 +2459,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
sql="alter table `LOGS` add index `NAME_IDX` (`NAME,LOG_EXISTS`)";
sql="alter table `LOGS` add index `NAME_IDX` (`NAME`,`LOG_EXISTS`)";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
@ -4632,7 +4632,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
"`MATRIX` int not null,"+
"`NUMBER` int not null,"+
"`MACRO_CART` int default 0,"+
"index `MATRIX_IDX` (`STATION_NAME`,`MATRIX,NUMBER`))"+
"index `MATRIX_IDX` (`STATION_NAME`,`MATRIX`,`NUMBER`))"+
" charset latin1 collate latin1_swedish_ci"+
db_table_create_postfix;
if(!RDSqlQuery::apply(sql,err_msg)) {