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

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

Browse Source 
* Cleaned up SQL quieries in 'utils/rdmaint/' to ensure UTF-8
	compatibility.
This commit is contained in:
Fred Gleason
2018-07-19 13:59:41 +00:00
parent e8d7d204cc
commit d144db3736
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -17172,3 +17172,6 @@
2018-07-19 Fred Gleason <fredg@paravelsystems.com> 2018-07-19 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up SQL quieries in 'utils/rdimport/' to ensure UTF-8 * Cleaned up SQL quieries in 'utils/rdimport/' to ensure UTF-8
compatibility. compatibility.
2018-07-19 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up SQL quieries in 'utils/rdmaint/' to ensure UTF-8
compatibility.

46
utils/rdmaint/rdmaint.cpp
View File

@@ -146,18 +146,23 @@ void MainObject::PurgeCuts()
RDSqlQuery *q2; RDSqlQuery *q2;
QDateTime dt=QDateTime(QDate::currentDate(),QTime::currentTime()); QDateTime dt=QDateTime(QDate::currentDate(),QTime::currentTime());
sql=QString("select NAME,CUT_SHELFLIFE,DELETE_EMPTY_CARTS from GROUPS ")+ sql=QString("select ")+
"where CUT_SHELFLIFE>=0"; "NAME,"+ // 00
"CUT_SHELFLIFE,"+ // 01
"DELETE_EMPTY_CARTS "+ // 02
"from GROUPS where "+
"CUT_SHELFLIFE>=0";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
sql=QString().sprintf("select CART.NUMBER,CUTS.CUT_NAME \ sql=QString("select ")+
from CUTS left join CART \ "CART.NUMBER,"+ // 00
on CUTS.CART_NUMBER=CART.NUMBER \ "CUTS.CUT_NAME "+ // 01
where (CART.GROUP_NAME=\"%s\")&&\ "from CUTS left join CART "+
(CUTS.END_DATETIME<\"%s 00:00:00\")", "on CUTS.CART_NUMBER=CART.NUMBER where "+
(const char *)RDEscapeString(q->value(0).toString()), "(CART.GROUP_NAME=\""+RDEscapeString(q->value(0).toString())+"\")&&"+
(const char *)dt.addDays(-q->value(1).toInt()). "(CUTS.END_DATETIME<\""+
toString("yyyy-MM-dd")); RDEscapeString(dt.addDays(-q->value(1).toInt()).toString("yyyy-MM-dd"))+
" 00:00:00\")";
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
while(q1->next()) { while(q1->next()) {
RDCart *cart=new RDCart(q1->value(0).toUInt()); RDCart *cart=new RDCart(q1->value(0).toUInt());
@@ -174,8 +179,8 @@ void MainObject::PurgeCuts()
(const char *)q1->value(1).toString())); (const char *)q1->value(1).toString()));
} }
if(q->value(2).toString()=="Y") { // Delete Empty Cart if(q->value(2).toString()=="Y") { // Delete Empty Cart
sql=QString().sprintf("select CUT_NAME from CUTS where CART_NUMBER=%u", sql=QString("select CUT_NAME from CUTS where ")+
q1->value(0).toUInt()); QString().sprintf("CART_NUMBER=%u",q1->value(0).toUInt());
q2=new RDSqlQuery(sql); q2=new RDSqlQuery(sql);
if(!q2->first()) { if(!q2->first()) {
cart->remove(rda->station(),rda->user(),rda->config()); cart->remove(rda->station(),rda->user(),rda->config());
@@ -245,17 +250,18 @@ void MainObject::PurgeDropboxes()
RDSqlQuery *q; RDSqlQuery *q;
RDSqlQuery *q1; RDSqlQuery *q1;
sql=QString().sprintf("select DROPBOX_PATHS.FILE_PATH,DROPBOX_PATHS.ID from \ sql=QString("select ")+
DROPBOXES left join DROPBOX_PATHS \ "DROPBOX_PATHS.FILE_PATH,"+ // 00
on (DROPBOXES.ID=DROPBOX_PATHS.DROPBOX_ID) \ "DROPBOX_PATHS.ID "+ // 01
where DROPBOXES.STATION_NAME=\"%s\"", "from DROPBOXES left join DROPBOX_PATHS "+
(const char *)RDEscapeString(rda->config()-> "on (DROPBOXES.ID=DROPBOX_PATHS.DROPBOX_ID) where "+
stationName())); "DROPBOXES.STATION_NAME=\""+RDEscapeString(rda->config()->stationName())+
"\"";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
if(!QFile::exists(q->value(0).toString())) { if(!QFile::exists(q->value(0).toString())) {
sql=QString().sprintf("delete from DROPBOX_PATHS where ID=%d", sql=QString("delete from DROPBOX_PATHS where ")+
q->value(1).toInt()); QString().sprintf("ID=%d",q->value(1).toInt());
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
delete q1; delete q1;
} }