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

* Cleaned up SQL quieries in 'rdlogmanager/' to ensure UTF-8
	compatibility.
This commit is contained in:
Fred Gleason
2018-07-17 22:52:47 +00:00
parent 8259cd9a62
commit cbec82b0d4
18 changed files with 778 additions and 432 deletions

View File

@@ -49,17 +49,12 @@ EditEvent::EditEvent(QString eventname,bool new_event,
std::vector<QString> *new_events,QWidget *parent)
: QDialog(parent,"",true)
{
QString str;
event_saved=false;
event_name=eventname;
event_new_event=new_event;
event_new_events=new_events;
event_event=new RDEvent(eventname);
str=QString(tr("Editing Event"));
setCaption(QString().
sprintf("%s - %s",(const char *)str,
(const char *)event_event->name()));
setCaption("RDLogManager - "+tr("Editing Event")+" - "+event_event->name());
//
// Fix the Window Size
@@ -175,9 +170,13 @@ EditEvent::EditEvent(QString eventname,bool new_event,
RDSqlQuery *q;
event_player = NULL;
#ifndef WIN32
sql=QString().sprintf("select OUTPUT_CARD,OUTPUT_PORT,START_CART,END_CART \
from RDLOGEDIT where STATION=\"%s\"",
(const char *)rda->station()->name());
sql=QString("select ")+
"OUTPUT_CARD,"+ // 00
"OUTPUT_PORT,"+ // 01
"START_CART,"+ // 02
"END_CART "+ // 03
"from RDLOGEDIT where "+
"STATION=\""+RDEscapeString(rda->station()->name())+"\"";
q=new RDSqlQuery(sql);
if(q->first()) {
event_player=
@@ -781,7 +780,7 @@ EditEvent::EditEvent(QString eventname,bool new_event,
if(color.isValid()) {
event_color_button->setPalette(QPalette(color,backgroundColor()));
}
str=event_event->nestedEvent();
QString str=event_event->nestedEvent();
sql=QString("select NAME from EVENTS where ")+
"NAME!=\""+RDEscapeString(eventname)+"\""+
"order by NAME";
@@ -1175,8 +1174,8 @@ void EditEvent::saveAsData()
return;
}
delete add_dialog;
QString sql=QString().sprintf("select NAME from EVENTS where NAME=\"%s\"",
(const char *)RDEscapeString(event_name));
QString sql=QString("select NAME from EVENTS where ")+
"NAME=\""+RDEscapeString(event_name)+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
if(!q->first()) {
delete event_event;
@@ -1187,8 +1186,7 @@ void EditEvent::saveAsData()
if(event_new_event) {
AbandonEvent(old_name);
}
setCaption(QString().
sprintf("Editing Event - %s",(const char *)event_event->name()));
setCaption("RDLogManager - "+tr("Editing Event")+" - "+event_event->name());
}
else {
if(QMessageBox::question(this,tr("RDLogManager"),tr("Event already exists!\nDo you want to overwrite it?"),QMessageBox::Yes,QMessageBox::No)!=
@@ -1199,8 +1197,8 @@ void EditEvent::saveAsData()
event_event=new RDEvent(event_name,true);
Save();
event_new_events->push_back(event_name);
sql=QString().sprintf("delete from EVENT_PERMS where EVENT_NAME=\"%s\"",
(const char *)RDEscapeString(event_name));
sql=QString("delete from EVENT_PERMS where ")+
"EVENT_NAME=\""+RDEscapeString(event_name)+"\"";
q=new RDSqlQuery(sql);
delete q;
CopyEventPerms(old_name,event_name);
@@ -1208,9 +1206,7 @@ void EditEvent::saveAsData()
AbandonEvent(old_name);
}
str=QString(tr("Edit Event"));
setCaption(QString().
sprintf("%s - %s",(const char *)str,
(const char *)event_event->name()));
setCaption("RDLogManager - "+tr("Edit Event")+" - "+event_event->name());
}
}
@@ -1297,35 +1293,41 @@ void EditEvent::RefreshLibrary()
type_filter="(TYPE=2)";
break;
}
QString sql="select TYPE,NUMBER,GROUP_NAME,FORCED_LENGTH,TITLE,ARTIST,\
START_DATETIME,END_DATETIME from CART";
QString sql=QString("select ")+
"TYPE,"+ // 00
"NUMBER,"+ // 01
"GROUP_NAME,"+ // 02
"FORCED_LENGTH,"+ // 03
"TITLE,"+ // 04
"ARTIST,"+ // 05
"START_DATETIME,"+ // 06
"END_DATETIME "+ // 07
"from CART ";
QString group=event_group_box->currentText();
if(group==QString(tr("ALL"))) {
group="";
}
sql+=QString().
sprintf(" where %s && %s",
(const char *)
RDCartSearchText(event_lib_filter_edit->text(),group,"",false).
utf8(),(const char *)type_filter);
sql+=QString(" where ")+
RDCartSearchText(event_lib_filter_edit->text(),group,"",false)+" && "+
type_filter;
RDSqlQuery *q=new RDSqlQuery(sql);
QListViewItem *item;
event_lib_list->clear();
while(q->next()) {
item=new QListViewItem(event_lib_list);
switch((RDCart::Type)q->value(0).toInt()) {
case RDCart::Audio:
item->setPixmap(0,*event_playout_map);
item->setText(8,tr("Audio"));
break;
case RDCart::Audio:
item->setPixmap(0,*event_playout_map);
item->setText(8,tr("Audio"));
break;
case RDCart::Macro:
item->setPixmap(0,*event_macro_map);
item->setText(8,tr("Macro"));
break;
case RDCart::Macro:
item->setPixmap(0,*event_macro_map);
item->setText(8,tr("Macro"));
break;
case RDCart::All:
break;
break;
}
item->setText(1,QString().sprintf("%06u",q->value(1).toInt()));
item->setText(2,q->value(2).toString());
@@ -1476,10 +1478,8 @@ QString EditEvent::GetProperties()
QString str;
if(event_position_box->isChecked()) {
str=QString(tr("Cue"));
properties+=
QString().sprintf("%s(-%s), ",(const char *)str,
(const char *)event_position_edit->time().toString("mm:ss"));
properties+=tr("Cue")+
"(-"+event_position_edit->time().toString("mm:ss")+")";
}
if(event_timetype_box->isChecked()) {
trans_type=(RDLogLine::TransType)event_transtype_box->currentItem();
@@ -1532,10 +1532,8 @@ QString EditEvent::GetProperties()
break;
default:
str=QString(tr("Timed(Wait"));
properties+=
QString().sprintf(", %s %s)",(const char *)str,(const char *)
event_grace_edit->time().toString("mm:ss"));
properties+=", "+tr("Timed(Wait)")+" "+
event_grace_edit->time().toString("mm:ss");
break;
}
if(event_post_box->isChecked()) {
@@ -1578,16 +1576,13 @@ void EditEvent::CopyEventPerms(QString old_name,QString new_name)
RDSqlQuery *q;
RDSqlQuery *q1;
sql=QString().sprintf("select SERVICE_NAME from EVENT_PERMS where\
EVENT_NAME=\"%s\"",
(const char *)RDEscapeString(old_name));
sql=QString("select SERVICE_NAME from EVENT_PERMS where ")+
"EVENT_NAME=\""+RDEscapeString(old_name)+"\"";
q=new RDSqlQuery(sql);
while(q->next()) {
sql=QString().sprintf("insert into EVENT_PERMS set\
EVENT_NAME=\"%s\",SERVICE_NAME=\"%s\"",
(const char *)RDEscapeString(new_name),
(const char *)
RDEscapeString(q->value(0).toString()));
sql=QString("insert into EVENT_PERMS set ")+
"EVENT_NAME=\""+RDEscapeString(new_name)+"\","+
"SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\"";
q1=new RDSqlQuery(sql);
delete q1;
}
@@ -1600,12 +1595,12 @@ void EditEvent::AbandonEvent(QString name)
if(name==event_name) {
return;
}
QString sql=QString().sprintf("delete from EVENTS where NAME=\"%s\"",
(const char *)RDEscapeString(name));
QString sql=QString("delete from EVENTS where ")+
"NAME=\""+RDEscapeString(name)+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
delete q;
sql=QString().sprintf("delete from EVENT_PERMS where EVENT_NAME=\"%s\"",
(const char *)RDEscapeString(name));
sql=QString("delete from EVENT_PERMS where ")+
"EVENT_NAME=\""+RDEscapeString(name)+"\"";
q=new RDSqlQuery(sql);
delete q;