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

* Cleaned up SQL quieries in 'rdadmin/' ensure UTF-8 compatibility.
This commit is contained in:
Fred Gleason
2018-07-16 17:31:07 -04:00
parent 363dbb7878
commit 36269f7725
61 changed files with 1430 additions and 1254 deletions

View File

@@ -33,8 +33,9 @@
#include <rd.h>
#include <rdapplication.h>
#include <rdcart_dialog.h>
#include <rddb.h>
#include <rdconf.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rduser.h>
#include "autofill_carts.h"
@@ -55,9 +56,7 @@ AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent)
svc_svc=svc;
str=QString(tr("Autofill Carts - Service:"));
setCaption(QString().sprintf("%s %s",(const char *)str,
(const char *)svc_svc->name()));
setCaption(tr("Autofill Carts - Service:")+" "+svc_svc->name());
//
// Create Fonts
@@ -175,15 +174,15 @@ void AutofillCarts::deleteData()
void AutofillCarts::okData()
{
QString sql=QString().sprintf("delete from AUTOFILLS where SERVICE=\"%s\"",
(const char *)svc_svc->name());
QString sql=QString("delete from AUTOFILLS where ")+
"SERVICE=\""+RDEscapeString(svc_svc->name())+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
delete q;
QListViewItem *item=svc_cart_list->firstChild();
while(item!=NULL) {
sql=QString().sprintf("insert into AUTOFILLS set SERVICE=\"%s\",\
CART_NUMBER=%u",(const char *)svc_svc->name(),
item->text(0).toUInt());
sql=QString("insert into AUTOFILLS set ")+
"SERVICE=\""+RDEscapeString(svc_svc->name())+"\","+
QString().sprintf("CART_NUMBER=%u",item->text(0).toUInt());
q=new RDSqlQuery(sql);
delete q;
item=item->nextSibling();
@@ -203,12 +202,13 @@ void AutofillCarts::RefreshList()
QListViewItem *item;
svc_cart_list->clear();
QString sql=QString().sprintf("select AUTOFILLS.CART_NUMBER,\
CART.FORCED_LENGTH,CART.TITLE,CART.ARTIST\
from AUTOFILLS left join CART\
on AUTOFILLS.CART_NUMBER=CART.NUMBER\
where SERVICE=\"%s\"",
(const char *)svc_svc->name());
QString sql=QString("select ")+
"AUTOFILLS.CART_NUMBER,"+ // 00
"CART.FORCED_LENGTH,"+ // 01
"CART.TITLE,CART.ARTIST "+ // 02
"from AUTOFILLS left join CART "+
"on AUTOFILLS.CART_NUMBER=CART.NUMBER where "+
"SERVICE=\""+RDEscapeString(svc_svc->name())+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
while(q->next()) {
item=new QListViewItem(svc_cart_list);