Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 17:13:47 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' of https://github.com/waynemerricks/rivendell into waynemerricks-stable

Browse Source
This commit is contained in:
Fred Gleason
2016-06-14 11:25:43 -04:00
parent 13f9111883 8baed5b104
commit c21c1a0d5d
23 changed files with 228 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/rddgimport/rddgimport.cpp
View File

@@ -431,6 +431,12 @@ bool MainWidget::CheckSpot(const QString &isci)
QDate today=QDate::currentDate();
QDate killdate=dg_date_edit->date().addDays(RDDGIMPORT_KILLDATE_OFFSET);
QString endDateTimeSQL = "NULL";
if(killdate.isValid())
endDateTimeSQL = RDCheckDateTime(QDateTime(killdate,QTime(23,59,59)),
"yyyy-MM-dd hh:mm:ss");
sql=QString("select CUT_NAME,CUTS.START_DATETIME,CUTS.END_DATETIME ")+
"from CART left join CUTS on CART.NUMBER=CUTS.CART_NUMBER "+
"where (CART.GROUP_NAME=\""+RDEscapeString(dg_svc->autospotGroup())+"\")&&"
@@ -443,7 +449,7 @@ bool MainWidget::CheckSpot(const QString &isci)
if(q->value(1).isNull()) {
sql+="START_DATETIME=\""+today.toString("yyyy-MM-dd")+" 00:00:00\",";
}
sql+="END_DATETIME=\""+killdate.toString("yyyy-MM-dd")+" 23:59:59\" ";
sql+="END_DATETIME="+endDateTimeSQL+" ";
sql+="where CUT_NAME=\""+q->value(0).toString()+"\"";
q1=new RDSqlQuery(sql);
delete q1;

8
utils/rdimport/rdimport.cpp
View File

@@ -1864,15 +1864,15 @@ void MainObject::WriteTimestampCache(const QString &filename,
sql=QString().sprintf("insert into DROPBOX_PATHS set \
DROPBOX_ID=%d,\
FILE_PATH=\"%s\",\
FILE_DATETIME=\"%s\"",
FILE_DATETIME=%s",
import_persistent_dropbox_id,
(const char *)RDEscapeString(filename),
(const char *)dt.toString("yyyy-MM-dd hh:mm:ss"));
(const char *)RDCheckDateTime(dt,"yyyy-MM-dd hh:mm:ss"));
}
else {
sql=QString().sprintf("update DROPBOX_PATHS set FILE_DATETIME=\"%s\" \
sql=QString().sprintf("update DROPBOX_PATHS set FILE_DATETIME=%s \
where (DROPBOX_ID=%d)&&(FILE_PATH=\"%s\")",
(const char *)dt.toString("yyyy-MM-dd hh:mm:ss"),
(const char *)RDCheckDateTime(dt,"yyyy-MM-dd hh:mm:ss"),
import_persistent_dropbox_id,
(const char *)RDEscapeString(filename));
}