From 5f2dc2a7a17db289d1aee388d1500804e3e36a56 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 19 Apr 2021 19:29:47 -0400 Subject: [PATCH] 2021-04-19 Fred Gleason * Escaped all SQL identifiers in 'rdcatch/'. * Replaced " with ' delimiters in all SQL literal strings in 'rdcatch/'. Signed-off-by: Fred Gleason --- ChangeLog | 4 + rdcatch/add_recording.cpp | 8 +- rdcatch/deckmon.cpp | 13 ++-- rdcatch/edit_cartevent.cpp | 29 +++---- rdcatch/edit_download.cpp | 30 ++++---- rdcatch/edit_playout.cpp | 12 +-- rdcatch/edit_recording.cpp | 66 ++++++++-------- rdcatch/edit_switchevent.cpp | 106 +++++++++++++------------- rdcatch/edit_upload.cpp | 34 ++++----- rdcatch/list_reports.cpp | 106 +++++++++++++------------- rdcatch/rdcatch.cpp | 101 ++++++++++++------------ rdcatch/recordlistmodel.cpp | 144 +++++++++++++++++------------------ 12 files changed, 330 insertions(+), 323 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5650d068..05fbe1bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21495,3 +21495,7 @@ * Escaped all SQL identifiers in 'rdcastmanager/'. * Replaced " with ' delimiters in all SQL literal strings in 'rdcastmanager/'. +2021-04-19 Fred Gleason + * Escaped all SQL identifiers in 'rdcatch/'. + * Replaced " with ' delimiters in all SQL literal strings in + 'rdcatch/'. diff --git a/rdcatch/add_recording.cpp b/rdcatch/add_recording.cpp index c139959a..6943c3f6 100644 --- a/rdcatch/add_recording.cpp +++ b/rdcatch/add_recording.cpp @@ -60,8 +60,8 @@ AddRecording::AddRecording(QString *filter,QWidget *parent) button->setFont(buttonFont()); button->setText(tr("Recording")); button->setDisabled(true); - QString sql=QString("select CHANNEL from DECKS \ - where (CARD_NUMBER>=0)&&(CHANNEL>0)&&(CHANNEL<=9)"); + QString sql=QString("select `CHANNEL` from `DECKS` where ")+ + "(`CARD_NUMBER`>=0)&&(`CHANNEL`>0)&&(`CHANNEL`<=9)"; RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { button->setEnabled(true); @@ -77,8 +77,8 @@ AddRecording::AddRecording(QString *filter,QWidget *parent) button->setFont(buttonFont()); button->setText(tr("Playout")); button->setDisabled(true); - sql=QString("select CHANNEL from DECKS where (CARD_NUMBER>=0)&&")+ - "(PORT_NUMBER>=0)&&(CHANNEL>128)&&(CHANNEL<=137)"; + sql=QString("select `CHANNEL` from `DECKS` where (`CARD`_NUMBER`>=0)&&")+ + "(`PORT_NUMBER`>=0)&&(`CHANNEL`>128)&&(`CHANNEL`<=137)"; q=new RDSqlQuery(sql); if(q->first()) { button->setEnabled(true); diff --git a/rdcatch/deckmon.cpp b/rdcatch/deckmon.cpp index a6d85e47..aeba6ca8 100644 --- a/rdcatch/deckmon.cpp +++ b/rdcatch/deckmon.cpp @@ -282,7 +282,8 @@ void DeckMon::SetCutInfo(int id,const QString &cutname) mon_cut_label->setText(""); return; } - sql=QString().sprintf("select DESCRIPTION from RECORDINGS where ID=%d",id); + sql=QString("select `DESCRIPTION` from `RECORDINGS` where ")+ + QString().sprintf("`ID`=%d",id); q=new RDSqlQuery(sql); if(!q->first()) { if(cutname.isEmpty()) { @@ -290,11 +291,11 @@ void DeckMon::SetCutInfo(int id,const QString &cutname) } else { sql=QString("select ")+ - "CART.TITLE,"+ // 00 - "CUTS.DESCRIPTION "+ // 01 - "from CART left join CUTS "+ - "on CART.NUMBER=CUTS.CART_NUMBER where "+ - "CUTS.CUT_NAME=\""+RDEscapeString(cutname)+"\""; + "`CART`.`TITLE`,"+ // 00 + "`CUTS`.`DESCRIPTION` "+ // 01 + "from `CART` left join `CUTS` "+ + "on `CART`.`NUMBER`=`CUTS`.`CART_NUMBER` where "+ + "`CUTS`.`CUT_NAME`='"+RDEscapeString(cutname)+"'"; q1=new RDSqlQuery(sql); if(q1->first()) { mon_cut_label-> diff --git a/rdcatch/edit_cartevent.cpp b/rdcatch/edit_cartevent.cpp index 41b21203..22022399 100644 --- a/rdcatch/edit_cartevent.cpp +++ b/rdcatch/edit_cartevent.cpp @@ -381,35 +381,36 @@ void EditCartEvent::Save() bool EditCartEvent::CheckEvent(bool include_myself) { - QString sql=QString("select ID from RECORDINGS where ")+ - "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+ - QString().sprintf("(TYPE=%d)&&",RDRecording::MacroEvent)+ - "(START_TIME=\""+RDEscapeString(edit_starttime_edit->time(). - toString("hh:mm:ss"))+"\")&&"+ - QString().sprintf("(MACRO_CART=%u)",edit_destination_edit->text().toUInt()); + QString sql=QString("select `ID` from `RECORDINGS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(edit_station_box->currentText())+"')&&"+ + QString().sprintf("(`TYPE`=%d)&&",RDRecording::MacroEvent)+ + "(`START_TIME`='"+RDEscapeString(edit_starttime_edit->time(). + toString("hh:mm:ss"))+"')&&"+ + QString().sprintf("(`MACRO_CART`=%u)", + edit_destination_edit->text().toUInt()); if(edit_sun_button->isChecked()) { - sql+="&&(SUN=\"Y\")"; + sql+="&&(`SUN`='Y')"; } if(edit_mon_button->isChecked()) { - sql+="&&(MON=\"Y\")"; + sql+="&&(`MON`='Y')"; } if(edit_tue_button->isChecked()) { - sql+="&&(TUE=\"Y\")"; + sql+="&&(`TUE`='Y')"; } if(edit_wed_button->isChecked()) { - sql+="&&(WED=\"Y\")"; + sql+="&&(`WED`='Y')"; } if(edit_thu_button->isChecked()) { - sql+="&&(THU=\"Y\")"; + sql+="&&(`THU`='Y')"; } if(edit_fri_button->isChecked()) { - sql+="&&(FRI=\"Y\")"; + sql+="&&(`FRI`='Y')"; } if(edit_sat_button->isChecked()) { - sql+="&&(SAT=\"Y\")"; + sql+="&&(`SAT`='Y')"; } if(!include_myself) { - sql+=QString().sprintf("&&(ID!=%d)",edit_recording->id()); + sql+=QString().sprintf("&&(`ID`!=%d)",edit_recording->id()); } RDSqlQuery *q=new RDSqlQuery(sql); bool res=!q->first(); diff --git a/rdcatch/edit_download.cpp b/rdcatch/edit_download.cpp index 8b296c2e..e3c5e843 100644 --- a/rdcatch/edit_download.cpp +++ b/rdcatch/edit_download.cpp @@ -582,36 +582,36 @@ void EditDownload::Save() bool EditDownload::CheckEvent(bool include_myself) { - QString sql=QString("select ID from RECORDINGS where ")+ - "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+ - QString().sprintf("(TYPE=%d)&&",RDRecording::Download)+ - "(START_TIME=\""+RDEscapeString(edit_starttime_edit->time(). - toString("hh:mm:ss"))+"\")&&"+ - "(URL=\""+RDEscapeString(edit_url_edit->text())+"\")&&"+ - "(CUT_NAME=\""+RDEscapeString(edit_destination_edit->text().right(10))+"\")"; + QString sql=QString("select `ID` from `RECORDINGS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(edit_station_box->currentText())+"')&&"+ + QString().sprintf("(`TYPE`=%d)&&",RDRecording::Download)+ + "(`START_TIME`='"+RDEscapeString(edit_starttime_edit->time(). + toString("hh:mm:ss"))+"')&&"+ + "(`URL`='"+RDEscapeString(edit_url_edit->text())+"')&&"+ + "(`CUT_NAME`='"+RDEscapeString(edit_destination_edit->text().right(10))+"')"; if(edit_sun_button->isChecked()) { - sql+="&&(SUN=\"Y\")"; + sql+="&&(`SUN`='Y')"; } if(edit_mon_button->isChecked()) { - sql+="&&(MON=\"Y\")"; + sql+="&&(`MON`='Y')"; } if(edit_tue_button->isChecked()) { - sql+="&&(TUE=\"Y\")"; + sql+="&&(`TUE`='Y')"; } if(edit_wed_button->isChecked()) { - sql+="&&(WED=\"Y\")"; + sql+="&&(`WED`='Y')"; } if(edit_thu_button->isChecked()) { - sql+="&&(THU=\"Y\")"; + sql+="&&(`THU`='Y')"; } if(edit_fri_button->isChecked()) { - sql+="&&(FRI=\"Y\")"; + sql+="&&(`FRI`='Y')"; } if(edit_sat_button->isChecked()) { - sql+="&&(SAT=\"Y\")"; + sql+="&&(`SAT`='Y')"; } if(!include_myself) { - sql+=QString().sprintf("&&(ID!=%d)",edit_recording->id()); + sql+=QString().sprintf("&&(`ID`!=%d)",edit_recording->id()); } RDSqlQuery *q=new RDSqlQuery(sql); bool res=!q->first(); diff --git a/rdcatch/edit_playout.cpp b/rdcatch/edit_playout.cpp index d18ac043..1c666e41 100644 --- a/rdcatch/edit_playout.cpp +++ b/rdcatch/edit_playout.cpp @@ -357,12 +357,12 @@ void EditPlayout::PopulateDecks(QComboBox *box) box->clear(); QString sql=QString("select ")+ - "STATION_NAME,"+ // 00 - "CHANNEL "+ // 01 - "from DECKS where "+ - "(CARD_NUMBER!=-1)&&"+ - "(PORT_NUMBER!=-1)&&"+ - "(CHANNEL>128) order by STATION_NAME,CHANNEL"; + "`STATION_NAME`,"+ // 00 + "`CHANNEL` "+ // 01 + "from `DECKS` where "+ + "(`CARD_NUMBER`!=-1)&&"+ + "(`PORT_NUMBER`!=-1)&&"+ + "(`CHANNEL`>128) order by `STATION_NAME`,`CHANNEL`"; RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { box->insertItem(box->count(),q->value(0).toString()+ diff --git a/rdcatch/edit_recording.cpp b/rdcatch/edit_recording.cpp index 5e0a94a2..10a2596b 100644 --- a/rdcatch/edit_recording.cpp +++ b/rdcatch/edit_recording.cpp @@ -592,9 +592,9 @@ void EditRecording::activateStationData(int id,bool use_temp) edit_channels_box->setCurrentIndex(edit_deck->defaultChannels()-1); } edit_source_box->clear(); - sql=QString("select NAME from INPUTS where ")+ - "(STATION_NAME=\""+RDEscapeString(edit_deck->switchStation())+"\")&&"+ - QString().sprintf("(MATRIX=%d)",edit_deck->switchMatrix()); + sql=QString("select `NAME` from `INPUTS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(edit_deck->switchStation())+"')&&"+ + QString().sprintf("(`MATRIX`=%d)",edit_deck->switchMatrix()); q=new RDSqlQuery(sql); while(q->next()) { edit_source_box-> @@ -759,14 +759,14 @@ void EditRecording::PopulateDecks(QComboBox *box) box->clear(); QString sql=QString("select ")+ - "STATION_NAME,"+ // 00 - "CHANNEL "+ // 01 - "from DECKS where "+ - "(CARD_NUMBER!=-1)&&"+ - "(PORT_NUMBER!=-1)&&"+ - "(CHANNEL!=0)&&"+ - "(CHANNEL<9) "+ - "order by STATION_NAME,CHANNEL"; + "`STATION_NAME`,"+ // 00 + "`CHANNEL` "+ // 01 + "from `DECKS` where "+ + "(`CARD_NUMBER`!=-1)&&"+ + "(`PORT_NUMBER`!=-1)&&"+ + "(`CHANNEL`!=0)&&"+ + "(`CHANNEL`<9) "+ + "order by `STATION_NAME`,`CHANNEL`"; RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { box->insertItem(box->count(),q->value(0).toString()+ @@ -1046,44 +1046,44 @@ bool EditRecording::CheckEvent(bool include_myself) break; } - QString sql=QString("select ID from RECORDINGS where ")+ - "(STATION_NAME=\""+RDEscapeString(f0[0])+"\")&&"+ - QString().sprintf("(TYPE=%d)&&",RDRecording::Recording)+ - "(START_TIME=\""+RDEscapeString(edit_starttime_edit->time().toString("hh:mm:ss"))+"\")&&"+ - QString().sprintf("(CHANNEL=%d)",f0[1].toInt()); + QString sql=QString("select `ID` from `RECORDINGS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(f0[0])+"')&&"+ + QString().sprintf("(`TYPE`=%d)&&",RDRecording::Recording)+ + "(`START_TIME`='"+RDEscapeString(edit_starttime_edit->time().toString("hh:mm:ss"))+"')&&"+ + QString().sprintf("(`CHANNEL`=%d)",f0[1].toInt()); switch((RDRecording::StartType)edit_starttype_group->checkedId()) { case RDRecording::HardStart: break; case RDRecording::GpiStart: - sql+=QString().sprintf("&&(START_MATRIX=%d)&&(START_LINE=%d)", + sql+=QString().sprintf("&&(`START_MATRIX`=%d)&&(`START_LINE`=%d)", edit_startmatrix_spin->value(), edit_startline_spin->value()); break; } if(edit_sun_button->isChecked()) { - sql+="&&(SUN=\"Y\")"; + sql+="&&(`SUN`='Y')"; } if(edit_mon_button->isChecked()) { - sql+="&&(MON=\"Y\")"; + sql+="&&(`MON`='Y')"; } if(edit_tue_button->isChecked()) { - sql+="&&(TUE=\"Y\")"; + sql+="&&(`TUE`='Y')"; } if(edit_wed_button->isChecked()) { - sql+="&&(WED=\"Y\")"; + sql+="&&(`WED`='Y')"; } if(edit_thu_button->isChecked()) { - sql+="&&(THU=\"Y\")"; + sql+="&&(`THU`='Y')"; } if(edit_fri_button->isChecked()) { - sql+="&&(FRI=\"Y\")"; + sql+="&&(`FRI`='Y')"; } if(edit_sat_button->isChecked()) { - sql+="&&(SAT=\"Y\")"; + sql+="&&(`SAT`='Y')"; } if(!include_myself) { - sql+=QString().sprintf("&&(ID!=%d)",edit_recording->id()); + sql+=QString().sprintf("&&(`ID`!=%d)",edit_recording->id()); } RDSqlQuery *q=new RDSqlQuery(sql); bool res=!q->first(); @@ -1103,10 +1103,10 @@ QString EditRecording::GetSourceName(int input) return QString("[unknown]"); } QString input_name; - QString sql=QString("select NAME from INPUTS where ")+ - "(STATION_NAME=\""+RDEscapeString(edit_deck->switchStation())+"\")&&"+ - QString().sprintf("(MATRIX=%d)&&",edit_deck->switchMatrix())+ - QString().sprintf("(NUMBER=%d)",input); + QString sql=QString("select `NAME` from `INPUTS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(edit_deck->switchStation())+"')&&"+ + QString().sprintf("(`MATRIX`=%d)&&",edit_deck->switchMatrix())+ + QString().sprintf("(`NUMBER`=%d)",input); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { input_name=q->value(0).toString(); @@ -1120,10 +1120,10 @@ int EditRecording::GetSource() { int source=-1; - QString sql=QString("select NUMBER from INPUTS where ")+ - "(STATION_NAME=\""+RDEscapeString(edit_deck->switchStation())+"\")&&"+ - QString().sprintf("(MATRIX=%d)&&",edit_deck->switchMatrix())+ - "(NAME=\""+RDEscapeString(edit_source_box->currentText())+"\")"; + QString sql=QString("select `NUMBER` from `INPUTS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(edit_deck->switchStation())+"')&&"+ + QString().sprintf("(`MATRIX`=%d)&&",edit_deck->switchMatrix())+ + "(`NAME`='"+RDEscapeString(edit_source_box->currentText())+"')"; RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { source=q->value(0).toInt(); diff --git a/rdcatch/edit_switchevent.cpp b/rdcatch/edit_switchevent.cpp index 318eed16..7674f658 100644 --- a/rdcatch/edit_switchevent.cpp +++ b/rdcatch/edit_switchevent.cpp @@ -267,7 +267,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) // Populate Data // edit_active_button->setChecked(edit_recording->isActive()); - q=new RDSqlQuery("select NAME from STATIONS where NAME!=\"DEFAULT\""); + q=new RDSqlQuery("select `NAME` from `STATIONS` where `NAME`!='DEFAULT'"); while(q->next()) { edit_station_box->insertItem(q->value(0).toString()); if(edit_recording->station()==q->value(0).toString()) { @@ -323,13 +323,13 @@ QSizePolicy EditSwitchEvent::sizePolicy() const void EditSwitchEvent::activateStationData(const QString &str) { QString sql=QString("select ")+ - "NAME,"+ - "MATRIX "+ - "from MATRICES where "+ - "(STATION_NAME=\""+RDEscapeString(str)+"\")&&"+ - "(INPUTS>0)&&" - "(OUTPUTS>0) "+ - "order by NAME"; + "`NAME`,"+ + "`MATRIX` "+ + "from `MATRICES` where "+ + "(`STATION_NAME`='"+RDEscapeString(str)+"')&&"+ + "(`INPUTS`>0)&&" + "(`OUTPUTS`>0) "+ + "order by `NAME`"; edit_matrix_box->clear(); RDSqlQuery *q=new RDSqlQuery(sql); int matrix=edit_recording->channel(); @@ -354,12 +354,12 @@ void EditSwitchEvent::activateMatrixData(const QString &str) } edit_matrix=new RDMatrix(edit_station_box->currentText(),GetMatrix()); QString sql=QString("select ")+ - "NAME," - "NUMBER "+ - "from INPUTS where "+ - "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+ - QString().sprintf("(MATRIX=%d) ",GetMatrix())+ - "order by NAME"; + "`NAME`," + "`NUMBER` "+ + "from `INPUTS` where "+ + "(`STATION_NAME`='"+RDEscapeString(edit_station_box->currentText())+"')&&"+ + QString().sprintf("(`MATRIX`=%d) ",GetMatrix())+ + "order by `NAME`"; edit_input_box->clear(); edit_input_box->insertItem(tr("--OFF--")); int input=edit_recording->switchSource(); @@ -382,12 +382,12 @@ void EditSwitchEvent::activateMatrixData(const QString &str) delete q; sql=QString("select ")+ - "NAME,"+ - "NUMBER "+ - "from OUTPUTS where "+ - "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+ - QString().sprintf("(MATRIX=%d) ",GetMatrix())+ - "order by NAME"; + "`NAME`,"+ + "`NUMBER` "+ + "from `OUTPUTS` where "+ + "(`STATION_NAME`='"+RDEscapeString(edit_station_box->currentText())+"')&&"+ + QString().sprintf("(`MATRIX`=%d) ",GetMatrix())+ + "order by `NAME`"; edit_output_box->clear(); int output=edit_recording->switchDestination(); if((outputs=edit_matrix->outputs())>0) { @@ -524,12 +524,12 @@ int EditSwitchEvent::GetMatrix() int matrix=-1; QString sql=QString("select ")+ - "MATRIX "+ - "from MATRICES where "+ - "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&" - "(NAME=\""+RDEscapeString(edit_matrix_box->currentText())+"\")&&"+ - "(INPUTS>0)&&"+ - "(OUTPUTS>0)"; + "`MATRIX` "+ + "from `MATRICES` where "+ + "(`STATION_NAME`='"+RDEscapeString(edit_station_box->currentText())+"')&&" + "(`NAME`='"+RDEscapeString(edit_matrix_box->currentText())+"')&&"+ + "(`INPUTS`>0)&&"+ + "(`OUTPUTS`>0)"; RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { matrix=q->value(0).toInt(); @@ -544,11 +544,11 @@ int EditSwitchEvent::GetSource() int input=0; QString sql=QString("select ")+ - "NUMBER "+ - "from INPUTS where "+ - "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+ - QString().sprintf("(MATRIX=%d)&&",GetMatrix())+ - "(NAME=\""+RDEscapeString(edit_input_box->currentText())+"\")"; + "`NUMBER` "+ + "from `INPUTS` where "+ + "(`STATION_NAME`='"+RDEscapeString(edit_station_box->currentText())+"')&&"+ + QString().sprintf("(`MATRIX`=%d)&&",GetMatrix())+ + "(`NAME`='"+RDEscapeString(edit_input_box->currentText())+"')"; RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { input=q->value(0).toInt(); @@ -563,11 +563,11 @@ int EditSwitchEvent::GetDestination() int output=-1; QString sql=QString("select ")+ - "NUMBER "+ - "from OUTPUTS where "+ - "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+ - QString().sprintf("(MATRIX=%d)&&",GetMatrix())+ - "(NAME=\""+RDEscapeString(edit_output_box->currentText())+"\")"; + "`NUMBER` "+ + "from `OUTPUTS` where "+ + "(`STATION_NAME`='"+RDEscapeString(edit_station_box->currentText())+"')&&"+ + QString().sprintf("(`MATRIX`=%d)&&",GetMatrix())+ + "(`NAME`='"+RDEscapeString(edit_output_box->currentText())+"')"; RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { output=q->value(0).toInt(); @@ -580,38 +580,38 @@ int EditSwitchEvent::GetDestination() bool EditSwitchEvent::CheckEvent(bool include_myself) { QString sql=QString("select ")+ - "ID "+ - "from RECORDINGS where "+ - "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+ - QString().sprintf("(TYPE=%d)&&",RDRecording::SwitchEvent)+ - "(START_TIME=\""+ - RDEscapeString(edit_starttime_edit->time().toString("hh:mm:ss"))+"\")&&"+ - QString().sprintf("(CHANNEL=%d)&&",GetMatrix())+ - QString().sprintf("(SWITCH_INPUT=%d)&&",GetSource())+ - QString().sprintf("(SWITCH_OUTPUT=%d)",GetDestination()); + "`ID` "+ + "from `RECORDINGS` where "+ + "(`STATION_NAME`='"+RDEscapeString(edit_station_box->currentText())+"')&&"+ + QString().sprintf("(`TYPE`=%d)&&",RDRecording::SwitchEvent)+ + "(`START_TIME`='"+ + RDEscapeString(edit_starttime_edit->time().toString("hh:mm:ss"))+"')&&"+ + QString().sprintf("(`CHANNEL`=%d)&&",GetMatrix())+ + QString().sprintf("(`SWITCH_INPUT`=%d)&&",GetSource())+ + QString().sprintf("(`SWITCH_OUTPUT`=%d)",GetDestination()); if(edit_sun_button->isChecked()) { - sql+="&&(SUN=\"Y\")"; + sql+="&&(`SUN`='Y')"; } if(edit_mon_button->isChecked()) { - sql+="&&(MON=\"Y\")"; + sql+="&&(`MON`='Y')"; } if(edit_tue_button->isChecked()) { - sql+="&&(TUE=\"Y\")"; + sql+="&&(`TUE`='Y')"; } if(edit_wed_button->isChecked()) { - sql+="&&(WED=\"Y\")"; + sql+="&&(`WED`='Y')"; } if(edit_thu_button->isChecked()) { - sql+="&&(THU=\"Y\")"; + sql+="&&(`THU`='Y')"; } if(edit_fri_button->isChecked()) { - sql+="&&(FRI=\"Y\")"; + sql+="&&(`FRI`='Y')"; } if(edit_sat_button->isChecked()) { - sql+="&&(SAT=\"Y\")"; + sql+="&&(`SAT`='Y')"; } if(!include_myself) { - sql+=QString().sprintf("&&(ID!=%d)",edit_recording->id()); + sql+=QString().sprintf("&&(`ID`!=%d)",edit_recording->id()); } RDSqlQuery *q=new RDSqlQuery(sql); bool res=!q->first(); diff --git a/rdcatch/edit_upload.cpp b/rdcatch/edit_upload.cpp index 8001d027..4e517fd6 100644 --- a/rdcatch/edit_upload.cpp +++ b/rdcatch/edit_upload.cpp @@ -366,7 +366,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, // // Populate Data // - q=new RDSqlQuery("select NAME from STATIONS where NAME!=\"DEFAULT\""); + q=new RDSqlQuery("select `NAME` from `STATIONS` where `NAME`!='DEFAULT'"); while(q->next()) { edit_station_box->insertItem(q->value(0).toString()); if(edit_recording->station()==q->value(0).toString()) { @@ -409,7 +409,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, } normalizeCheckData(edit_normalize_box->isChecked()); int feed_id=edit_recording->feedId(); - sql="select ID,KEY_NAME from FEEDS order by KEY_NAME"; + sql="select `ID`,`KEY_NAME` from `FEEDS` order by `KEY_NAME`"; q=new RDSqlQuery(sql); while(q->next()) { edit_feed_box->insertItem(edit_feed_box->count(),q->value(1).toString()); @@ -654,36 +654,36 @@ void EditUpload::Save() bool EditUpload::CheckEvent(bool include_myself) { - QString sql=QString("select ID from RECORDINGS where ")+ - "(STATION_NAME=\""+RDEscapeString(edit_station_box->currentText())+"\")&&"+ - QString().sprintf("(TYPE=%d)&&",RDRecording::Upload)+ - "(START_TIME=\""+edit_starttime_edit->time().toString("hh:mm:ss")+"\")&&"+ - "(URL=\""+RDEscapeString(edit_url_edit->text())+"\")&&"+ - "(CUT_NAME=\""+RDEscapeString(edit_destination_edit->text().right(10))+ - "\")"; + QString sql=QString("select `ID` from `RECORDINGS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(edit_station_box->currentText())+"')&&"+ + QString().sprintf("(`TYPE`=%d)&&",RDRecording::Upload)+ + "(`START_TIME`='"+edit_starttime_edit->time().toString("hh:mm:ss")+"')&&"+ + "(`URL`='"+RDEscapeString(edit_url_edit->text())+"')&&"+ + "(`CUT_NAME`='"+RDEscapeString(edit_destination_edit->text().right(10))+ + "')"; if(edit_sun_button->isChecked()) { - sql+="&&(SUN=\"Y\")"; + sql+="&&(`SUN`='Y')"; } if(edit_mon_button->isChecked()) { - sql+="&&(MON=\"Y\")"; + sql+="&&(`MON`='Y')"; } if(edit_tue_button->isChecked()) { - sql+="&&(TUE=\"Y\")"; + sql+="&&(`TUE`='Y')"; } if(edit_wed_button->isChecked()) { - sql+="&&(WED=\"Y\")"; + sql+="&&(`WED`='Y')"; } if(edit_thu_button->isChecked()) { - sql+="&&(THU=\"Y\")"; + sql+="&&(`THU`='Y')"; } if(edit_fri_button->isChecked()) { - sql+="&&(FRI=\"Y\")"; + sql+="&&(`FRI`='Y')"; } if(edit_sat_button->isChecked()) { - sql+="&&(SAT=\"Y\")"; + sql+="&&(`SAT`='Y')"; } if(!include_myself) { - sql+=QString().sprintf("&&(ID!=%d)",edit_recording->id()); + sql+=QString().sprintf("&&(`ID`!=%d)",edit_recording->id()); } RDSqlQuery *q=new RDSqlQuery(sql); bool res=!q->first(); diff --git a/rdcatch/list_reports.cpp b/rdcatch/list_reports.cpp index 2daabc3f..66451938 100644 --- a/rdcatch/list_reports.cpp +++ b/rdcatch/list_reports.cpp @@ -143,28 +143,28 @@ void ListReports::GenerateEventReport(QString *report) // Generate Rows // sql=QString("select ")+ - "TYPE,"+ // 00 - "START_TYPE,"+ // 01 - "START_TIME,"+ // 02 - "END_TYPE,"+ // 03 - "END_TIME,"+ // 04 - "LENGTH,"+ // 05 - "SUN,"+ // 06 - "MON,"+ // 07 - "TUE,"+ // 08 - "WED,"+ // 09 - "THU,"+ // 10 - "FRI,"+ // 11 - "SAT,"+ // 12 - "STATION_NAME,"+ // 13 - "CHANNEL,"+ // 14 - "CUT_NAME,"+ // 15 - "URL,"+ // 16 - "MACRO_CART,"+ // 17 - "SWITCH_INPUT,"+ // 18 - "SWITCH_OUTPUT,"+ // 19 - "DESCRIPTION "+ // 20 - "from RECORDINGS order by START_TIME"; + "`TYPE`,"+ // 00 + "`START_TYPE`,"+ // 01 + "`START_TIME`,"+ // 02 + "`END_TYPE`,"+ // 03 + "`END_TIME`,"+ // 04 + "`LENGTH`,"+ // 05 + "`SUN`,"+ // 06 + "`MON`,"+ // 07 + "`TUE`,"+ // 08 + "`WED`,"+ // 09 + "`THU`,"+ // 10 + "`FRI`,"+ // 11 + "`SAT`,"+ // 12 + "`STATION_NAME`,"+ // 13 + "`CHANNEL`,"+ // 14 + "`CUT_NAME`,"+ // 15 + "`URL`,"+ // 16 + "`MACRO_CART`,"+ // 17 + "`SWITCH_INPUT`,"+ // 18 + "`SWITCH_OUTPUT`,"+ // 19 + "`DESCRIPTION` "+ // 20 + "from `RECORDINGS` order by `START_TIME`"; q=new RDSqlQuery(sql); while(q->next()) { // @@ -328,11 +328,11 @@ void ListReports::GenerateEventReport(QString *report) switch((RDRecording::Type)q->value(0).toInt()) { case RDRecording::Recording: sql=QString("select ")+ - "SWITCH_STATION,"+ // 00 - "SWITCH_MATRIX "+ // 01 - "from DECKS where "+ - "(STATION_NAME=\""+RDEscapeString(q->value(13).toString())+"\")&&"+ - QString().sprintf("(CHANNEL=%d)",q->value(14).toInt()); + "`SWITCH_STATION`,"+ // 00 + "`SWITCH_MATRIX` "+ // 01 + "from `DECKS` where "+ + "(`STATION_NAME`='"+RDEscapeString(q->value(13).toString())+"')&&"+ + QString().sprintf("(`CHANNEL`=%d)",q->value(14).toInt()); q1=new RDSqlQuery(sql); if(q1->first()) { *report+= @@ -420,24 +420,24 @@ void ListReports::GenerateXloadReport(QString *report) // Generate Rows // sql=QString("select ")+ - "TYPE,"+ // 00 - "START_TIME,"+ // 01 - "SUN,"+ // 02 - "MON,"+ // 03 - "TUE,"+ // 04 - "WED,"+ // 05 - "THU,"+ // 06 - "FRI,"+ // 07 - "SAT,"+ // 08 - "STATION_NAME,"+ // 09 - "CUT_NAME,"+ // 10 - "URL,"+ // 11 - "URL_USERNAME,"+ // 12 - "DESCRIPTION "+ // 13 - "from RECORDINGS where "+ - QString().sprintf("(TYPE=%d)||",RDRecording::Upload)+ - QString().sprintf("(TYPE=%d) ",RDRecording::Download)+ - "order by START_TIME"; + "`TYPE`,"+ // 00 + "`START_TIME`,"+ // 01 + "`SUN`,"+ // 02 + "`MON`,"+ // 03 + "`TUE`,"+ // 04 + "`WED`,"+ // 05 + "`THU`,"+ // 06 + "`FRI`,"+ // 07 + "`SAT`,"+ // 08 + "`STATION_NAME`,"+ // 09 + "`CUT_NAME`,"+ // 10 + "`URL`,"+ // 11 + "`URL_USERNAME`,"+ // 12 + "`DESCRIPTION` "+ // 13 + "from `RECORDINGS` where "+ + QString().sprintf("(`TYPE`=%d)||",RDRecording::Upload)+ + QString().sprintf("(`TYPE`=%d) ",RDRecording::Download)+ + "order by `START_TIME`"; q=new RDSqlQuery(sql); while(q->next()) { // @@ -555,10 +555,10 @@ void ListReports::GenerateXloadReport(QString *report) QString ListReports::GetSourceName(const QString &station,int matrix,int input) { QString input_name; - QString sql=QString("select NAME from INPUTS where ")+ - "(STATION_NAME=\""+RDEscapeString(station)+"\")&&"+ - QString().sprintf("(MATRIX=%d)&&",matrix)+ - QString().sprintf("(NUMBER=%d)",input); + QString sql=QString("select `NAME` from `INPUTS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(station)+"')&&"+ + QString().sprintf("(`MATRIX`=%d)&&",matrix)+ + QString().sprintf("(`NUMBER`=%d)",input); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { input_name=q->value(0).toString(); @@ -572,10 +572,10 @@ QString ListReports::GetDestinationName(const QString &station,int matrix, int output) { QString output_name; - QString sql=QString("select NAME from OUTPUTS where ")+ - "(STATION_NAME=\""+RDEscapeString(station)+"\")&&"+ - QString().sprintf("(MATRIX=%d)&&",matrix)+ - QString().sprintf("(NUMBER=%d)",output); + QString sql=QString("select `NAME` from `OUTPUTS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(station)+"')&&"+ + QString().sprintf("(`MATRIX`=%d)&&",matrix)+ + QString().sprintf("(`NUMBER`=%d)",output); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { output_name=q->value(0).toString(); diff --git a/rdcatch/rdcatch.cpp b/rdcatch/rdcatch.cpp index 6cf8f542..f555ab74 100644 --- a/rdcatch/rdcatch.cpp +++ b/rdcatch/rdcatch.cpp @@ -184,9 +184,9 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) connect(mon_mapper,SIGNAL(mapped(int)),this,SLOT(monitorData(int))); QString sql; RDSqlQuery *q1; - RDSqlQuery *q= - new RDSqlQuery("select NAME,IPV4_ADDRESS from STATIONS\ - where NAME!=\"DEFAULT\""); + sql=QString("select `NAME`,`IPV4_ADDRESS` from `STATIONS` where ")+ + "`NAME`!='DEFAULT'"; + RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { catch_connect.push_back(new CatchConnector(new RDCatchConnect(catch_connect.size(),this),q->value(0).toString().toLower())); connect(catch_connect.back()->connector(), @@ -218,12 +218,13 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) connectHost(q->value(1).toString(),RDCATCHD_TCP_PORT, rda->config()->password()); sql=QString("select ")+ - "CHANNEL,"+ // 00 - "MON_PORT_NUMBER "+ // 01 - "from DECKS where "+ - "(CARD_NUMBER!=-1)&&(PORT_NUMBER!=-1)&&(CHANNEL>0)&&"+ - "(STATION_NAME=\""+RDEscapeString(q->value(0).toString().toLower())+"\") "+ - "order by CHANNEL"; + "`CHANNEL`,"+ // 00 + "`MON_PORT_NUMBER` "+ // 01 + "from `DECKS` where "+ + "(`CARD_NUMBER`!=-1)&&(`PORT_NUMBER`!=-1)&&(`CHANNEL`>0)&&"+ + "(`STATION_NAME`='"+ + RDEscapeString(q->value(0).toString().toLower())+"') "+ + "order by `CHANNEL`"; q1=new RDSqlQuery(sql); while(q1->next()) { catch_connect.back()->chan.push_back(q1->value(0).toUInt()); @@ -673,8 +674,8 @@ void MainWidget::deleteData() fprintf(stderr,"rdcatch: invalid connection index!\n"); return; } - sql=QString("delete from RECORDINGS where ")+ - QString().sprintf("ID=%u",catch_recordings_model->recordId(rows.first())); + sql=QString("delete from `RECORDINGS` where ")+ + QString().sprintf("`ID`=%u",catch_recordings_model->recordId(rows.first())); RDSqlQuery::apply(sql); RDNotification *notify=new RDNotification(RDNotification::CatchEventType, RDNotification::DeleteAction, @@ -1006,38 +1007,38 @@ void MainWidget::filterChangedData(bool state) QString sql; if(catch_show_active_box->isChecked()) { - sql+="(RECORDINGS.IS_ACTIVE=\"Y\")&&"; + sql+="(`RECORDINGS`.`IS_ACTIVE`='Y')&&"; } if(catch_show_today_box->isChecked()) { QDate today=QDate::currentDate(); switch(today.dayOfWeek()) { case 1: - sql+="(RECORDINGS.MON=\"Y\")&&"; + sql+="(`RECORDINGS`.`MON`='Y')&&"; break; case 2: - sql+="(RECORDINGS.TUE=\"Y\")&&"; + sql+="(`RECORDINGS`.`TUE`='Y')&&"; break; case 3: - sql+="(RECORDINGS.WED=\"Y\")&&"; + sql+="(`RECORDINGS`.`WED`='Y')&&"; break; case 4: - sql+="(RECORDINGS.THU=\"Y\")&&"; + sql+="(`RECORDINGS`.`THU`='Y')&&"; break; case 5: - sql+="(RECORDINGS.FRI=\"Y\")&&"; + sql+="(`RECORDINGS`.`FRI`='Y')&&"; break; case 6: - sql+="(RECORDINGS.SAT=\"Y\")&&"; + sql+="(`RECORDINGS`.`SAT`='Y')&&"; break; case 7: - sql+="(RECORDINGS.SUN=\"Y\")&&"; + sql+="(`RECORDINGS`.`SUN`='Y')&&"; break; } } @@ -1046,43 +1047,43 @@ void MainWidget::filterChangedData(bool state) break; case 1: // Weekdays - sql+=QString("((RECORDINGS.MON=\"Y\")||")+ - "(RECORDINGS.TUE=\"Y\")||"+ - "(RECORDINGS.WED=\"Y\")||"+ - "(RECORDINGS.THU=\"Y\")||"+ - "(RECORDINGS.FRI=\"Y\"))&&"; + sql+=QString("((`RECORDINGS`.`MON`='Y')||")+ + "(`RECORDINGS`.`TUE`='Y')||"+ + "(`RECORDINGS`.`WED`='Y')||"+ + "(`RECORDINGS`.`THU`='Y')||"+ + "(`RECORDINGS`.`FRI`='Y'))&&"; break; case 2: // Sunday - sql+="(RECORDINGS.SUN=\"Y\")&&"; + sql+="(`RECORDINGS`.`SUN`='Y')&&"; break; case 3: // Monday - sql+="(RECORDINGS.MON=\"Y\")&&"; + sql+="(`RECORDINGS`.`MON`='Y')&&"; break; case 4: // Tuesday - sql+="(RECORDINGS.TUE=\"Y\")&&"; + sql+="(`RECORDINGS`.`TUE`='Y')&&"; break; case 5: // Wednesday - sql+="(RECORDINGS.WED=\"Y\")&&"; + sql+="(`RECORDINGS`.`WED`='Y')&&"; break; case 6: // Thursday - sql+="(RECORDINGS.THU=\"Y\")&&"; + sql+="(`RECORDINGS`.`THU`='Y')&&"; break; case 7: // Friday - sql+="(RECORDINGS.FRI=\"Y\")&&"; + sql+="(`RECORDINGS`.`FRI`='Y')&&"; break; case 8: // Saturday - sql+="(RECORDINGS.SAT=\"Y\")&&"; + sql+="(`RECORDINGS`.`SAT`='Y')&&"; break; } if(catch_type_box->currentIndex()currentIndex()); } @@ -1186,23 +1187,23 @@ int MainWidget::ShowNextEvents(int day,QTime time,QTime *next) int count=0; if(time.isNull()) { sql=QString("select ")+ - "ID,"+ // 00 - "START_TIME "+ // 01 - "from RECORDINGS where "+ - "(IS_ACTIVE=\"Y\")&&"+ - "("+RDGetShortDayNameEN(day).toUpper()+"=\"Y\") "+ - "order by START_TIME"; + "`ID`,"+ // 00 + "`START_TIME` "+ // 01 + "from `RECORDINGS` where "+ + "(`IS_ACTIVE`='Y')&&"+ + "("+RDGetShortDayNameEN(day).toUpper()+"='Y') "+ + "order by `START_TIME`"; } else { sql=QString("select ")+ - "ID,"+ - "START_TIME "+ - "from RECORDINGS where "+ - "(IS_ACTIVE=\"Y\")&&"+ - "(time_to_sec(START_TIME)>time_to_sec(\""+ - RDEscapeString(time.toString("hh:mm:ss"))+"\"))&&"+ - "("+RDGetShortDayNameEN(day).toUpper()+"=\"Y\")"+ - "order by START_TIME"; + "`ID`,"+ + "`START_TIME` "+ + "from `RECORDINGS` where "+ + "(`IS_ACTIVE`='Y')&&"+ + "(time_to_sec(`START_TIME`)>time_to_sec('"+ + RDEscapeString(time.toString("hh:mm:ss"))+"'))&&"+ + "("+RDGetShortDayNameEN(day).toUpper()+"='Y')"+ + "order by `START_TIME`"; } RDSqlQuery *q=new RDSqlQuery(sql); if(!q->first()) { @@ -1226,10 +1227,10 @@ unsigned MainWidget::AddRecord() { QString sql; - sql=QString("insert into RECORDINGS set ")+ - "STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\","+ - "CHANNEL=0,"+ - "CUT_NAME=\"\""; + sql=QString("insert into `RECORDINGS` set ")+ + "`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"',"+ + "`CHANNEL`=0,"+ + "`CUT_NAME`=''"; return RDSqlQuery::run(sql).toUInt(); } diff --git a/rdcatch/recordlistmodel.cpp b/rdcatch/recordlistmodel.cpp index 984efa33..1a78da3c 100644 --- a/rdcatch/recordlistmodel.cpp +++ b/rdcatch/recordlistmodel.cpp @@ -424,7 +424,7 @@ void RecordListModel::refresh(const QModelIndex &row) { if(row.row()first()) { updateRow(row.row(),q); @@ -465,7 +465,7 @@ void RecordListModel::updateModel() RDSqlQuery *q=NULL; QString sql=sqlFields()+ d_filter_sql+ - "order by RECORDINGS.START_TIME "; + "order by `RECORDINGS`.`START_TIME` "; beginResetModel(); d_ids.clear(); d_types.clear(); @@ -498,7 +498,7 @@ void RecordListModel::updateRowLine(int line) { if(linefirst()) { updateRow(line,q); @@ -629,11 +629,11 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q) } texts[5]=tr("Cut")+" "+q->value(6).toString(); sql=QString("select ")+ - "SWITCH_STATION,"+ // 00 - "SWITCH_MATRIX "+ // 01 - "from DECKS where "+ - "(STATION_NAME=\""+RDEscapeString(q->value(3).toString())+"\")&&"+ - QString().sprintf("(CHANNEL=%d)",q->value(24).toInt()); + "`SWITCH_STATION`,"+ // 00 + "`SWITCH_MATRIX` "+ // 01 + "from `DECKS` where "+ + "(`STATION_NAME`='"+RDEscapeString(q->value(3).toString())+"')&&"+ + QString().sprintf("(`CHANNEL`=%d)",q->value(24).toInt()); q1=new RDSqlQuery(sql); if(q1->first()) { // Source texts[4]=GetSourceName(q1->value(0).toString(),q1->value(1).toInt(), @@ -774,55 +774,55 @@ void RecordListModel::updateRow(int row,RDSqlQuery *q) QString RecordListModel::sqlFields() const { QString sql=QString("select ")+ - "RECORDINGS.ID,"+ // 00 - "RECORDINGS.DESCRIPTION,"+ // 01 - "RECORDINGS.IS_ACTIVE,"+ // 02 - "RECORDINGS.STATION_NAME,"+ // 03 - "RECORDINGS.START_TIME,"+ // 04 - "RECORDINGS.LENGTH,"+ // 05 - "RECORDINGS.CUT_NAME,"+ // 06 - "RECORDINGS.SUN,"+ // 07 - "RECORDINGS.MON,"+ // 08 - "RECORDINGS.TUE,"+ // 09 - "RECORDINGS.WED,"+ // 10 - "RECORDINGS.THU,"+ // 11 - "RECORDINGS.FRI,"+ // 12 - "RECORDINGS.SAT,"+ // 13 - "RECORDINGS.SWITCH_INPUT,"+ // 14 - "RECORDINGS.START_GPI,"+ // 15 - "RECORDINGS.END_GPI,"+ // 16 - "RECORDINGS.TRIM_THRESHOLD,"+ // 17 - "RECORDINGS.STARTDATE_OFFSET,"+ // 18 - "RECORDINGS.ENDDATE_OFFSET,"+ // 19 - "RECORDINGS.FORMAT,"+ // 20 - "RECORDINGS.CHANNELS,"+ // 21 - "RECORDINGS.SAMPRATE,"+ // 22 - "RECORDINGS.BITRATE,"+ // 23 - "RECORDINGS.CHANNEL,"+ // 24 - "RECORDINGS.MACRO_CART,"+ // 25 - "RECORDINGS.TYPE,"+ // 26 - "RECORDINGS.SWITCH_OUTPUT,"+ // 27 - "RECORDINGS.EXIT_CODE,"+ // 28 - "RECORDINGS.ONE_SHOT,"+ // 29 - "RECORDINGS.START_TYPE,"+ // 30 - "RECORDINGS.START_LENGTH,"+ // 31 - "RECORDINGS.START_MATRIX,"+ // 32 - "RECORDINGS.START_LINE,"+ // 33 - "RECORDINGS.START_OFFSET,"+ // 34 - "RECORDINGS.END_TYPE,"+ // 35 - "RECORDINGS.END_TIME,"+ // 36 - "RECORDINGS.END_LENGTH,"+ // 37 - "RECORDINGS.END_MATRIX,"+ // 38 - "RECORDINGS.END_LINE,"+ // 39 - "CUTS.ORIGIN_NAME,"+ // 40 - "CUTS.ORIGIN_DATETIME,"+ // 41 - "RECORDINGS.URL,"+ // 42 - "RECORDINGS.QUALITY,"+ // 43 - "FEEDS.KEY_NAME,"+ // 44 - "EXIT_TEXT "+ // 45 - "from RECORDINGS left join CUTS "+ - "on (RECORDINGS.CUT_NAME=CUTS.CUT_NAME) left join FEEDS "+ - "on (RECORDINGS.FEED_ID=FEEDS.ID) "; + "`RECORDINGS`.`ID`,"+ // 00 + "`RECORDINGS`.`DESCRIPTION`,"+ // 01 + "`RECORDINGS`.`IS_ACTIVE`,"+ // 02 + "`RECORDINGS`.`STATION_NAME`,"+ // 03 + "`RECORDINGS`.`START_TIME`,"+ // 04 + "`RECORDINGS`.`LENGTH`,"+ // 05 + "`RECORDINGS`.`CUT_NAME`,"+ // 06 + "`RECORDINGS`.`SUN`,"+ // 07 + "`RECORDINGS`.`MON`,"+ // 08 + "`RECORDINGS`.`TUE`,"+ // 09 + "`RECORDINGS`.`WED`,"+ // 10 + "`RECORDINGS`.`THU`,"+ // 11 + "`RECORDINGS`.`FRI`,"+ // 12 + "`RECORDINGS`.`SAT`,"+ // 13 + "`RECORDINGS`.`SWITCH_INPUT`,"+ // 14 + "`RECORDINGS`.`START_GPI`,"+ // 15 + "`RECORDINGS`.`END_GPI`,"+ // 16 + "`RECORDINGS`.`TRIM_THRESHOLD`,"+ // 17 + "`RECORDINGS`.`STARTDATE_OFFSET`,"+ // 18 + "`RECORDINGS`.`ENDDATE_OFFSET`,"+ // 19 + "`RECORDINGS`.`FORMAT`,"+ // 20 + "`RECORDINGS`.`CHANNELS`,"+ // 21 + "`RECORDINGS`.`SAMPRATE`,"+ // 22 + "`RECORDINGS`.`BITRATE`,"+ // 23 + "`RECORDINGS`.`CHANNEL`,"+ // 24 + "`RECORDINGS`.`MACRO_CART`,"+ // 25 + "`RECORDINGS`.`TYPE`,"+ // 26 + "`RECORDINGS`.`SWITCH_OUTPUT`,"+ // 27 + "`RECORDINGS`.`EXIT_CODE`,"+ // 28 + "`RECORDINGS`.`ONE_SHOT`,"+ // 29 + "`RECORDINGS`.`START_TYPE`,"+ // 30 + "`RECORDINGS`.`START_LENGTH`,"+ // 31 + "`RECORDINGS`.`START_MATRIX`,"+ // 32 + "`RECORDINGS`.`START_LINE`,"+ // 33 + "`RECORDINGS`.`START_OFFSET`,"+ // 34 + "`RECORDINGS`.`END_TYPE`,"+ // 35 + "`RECORDINGS`.`END_TIME`,"+ // 36 + "`RECORDINGS`.`END_LENGTH`,"+ // 37 + "`RECORDINGS`.`END_MATRIX`,"+ // 38 + "`RECORDINGS`.`END_LINE`,"+ // 39 + "`CUTS`.`ORIGIN_NAME`,"+ // 40 + "`CUTS`.`ORIGIN_DATETIME`,"+ // 41 + "`RECORDINGS`.`URL`,"+ // 42 + "`RECORDINGS`.`QUALITY`,"+ // 43 + "`FEEDS`.`KEY_NAME`,"+ // 44 + "`EXIT_TEXT` "+ // 45 + "from `RECORDINGS` left join `CUTS` "+ + "on (`RECORDINGS`.`CUT_NAME`=`CUTS`.`CUT_NAME`) left join `FEEDS` "+ + "on (`RECORDINGS`.`FEED_ID`=`FEEDS`.`ID`) "; return sql; } @@ -831,10 +831,10 @@ QString RecordListModel::sqlFields() const QString RecordListModel::GetSourceName(QString station,int matrix,int input) { QString input_name; - QString sql=QString("select NAME from INPUTS where ")+ - "(STATION_NAME=\""+RDEscapeString(station)+"\")&&"+ - QString().sprintf("(MATRIX=%d)&&",matrix)+ - QString().sprintf("(NUMBER=%d)",input); + QString sql=QString("select `NAME` from `INPUTS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(station)+"')&&"+ + QString().sprintf("(`MATRIX`=%d)&&",matrix)+ + QString().sprintf("(`NUMBER`=%d)",input); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { input_name=q->value(0).toString(); @@ -848,10 +848,10 @@ QString RecordListModel::GetDestinationName(QString station,int matrix, int output) { QString output_name; - QString sql=QString("select NAME from OUTPUTS where ")+ - "(STATION_NAME=\""+RDEscapeString(station)+"\")&&"+ - QString().sprintf("(MATRIX=%d)&&",matrix)+ - QString().sprintf("(NUMBER=%d)",output); + QString sql=QString("select `NAME` from `OUTPUTS` where ")+ + "(`STATION_NAME`='"+RDEscapeString(station)+"')&&"+ + QString().sprintf("(`MATRIX`=%d)&&",matrix)+ + QString().sprintf("(`NUMBER`=%d)",output); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { output_name=q->value(0).toString(); @@ -888,13 +888,13 @@ void RecordListModel::UpdateStatus(int line) RDRecording::ExitCode code=RDRecording::InternalError; QString err_text=tr("Unknown"); QString sql=QString("select ")+ - "RECORDINGS.EXIT_CODE,"+ // 00 - "CUTS.ORIGIN_NAME,"+ // 01 - "CUTS.ORIGIN_DATETIME,"+ // 02 - "RECORDINGS.EXIT_TEXT "+ // 03 - "from RECORDINGS left join CUTS "+ - "on RECORDINGS.CUT_NAME=CUTS.CUT_NAME where "+ - QString().sprintf("RECORDINGS.ID=%u",d_ids.at(line)); + "`RECORDINGS`.`EXIT_CODE`,"+ // 00 + "`CUTS`.`ORIGIN_NAME`,"+ // 01 + "`CUTS`.`ORIGIN_DATETIME`,"+ // 02 + "`RECORDINGS`.`EXIT_TEXT` "+ // 03 + "from `RECORDINGS` left join `CUTS` "+ + "on `RECORDINGS`.`CUT_NAME`=`CUTS`.`CUT_NAME` where "+ + QString().sprintf("`RECORDINGS`.`ID`=%u",d_ids.at(line)); RDSqlQuery *q=new RDSqlQuery(sql); if(q->first()) { code=(RDRecording::ExitCode)q->value(0).toInt();