Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-07 15:42:34 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Cleaned up SQL quieries in 'utils/rdimport/' to ensure UTF-8
	compatibility.
This commit is contained in:
Fred Gleason 2018-07-19 13:51:17 +00:00
parent 53fee4a393
commit e8d7d204cc
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

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

27
utils/rdimport/rdimport.cpp
View File

@ -1919,10 +1919,9 @@ QDateTime MainObject::GetCachedTimestamp(const QString &filename)
if(import_persistent_dropbox_id<0) { if(import_persistent_dropbox_id<0) {
return dt; return dt;
} }
sql=QString().sprintf("select FILE_DATETIME from DROPBOX_PATHS \ sql=QString().sprintf("select FILE_DATETIME from DROPBOX_PATHS where ")+
where (DROPBOX_ID=%d)&&(FILE_PATH=\"%s\")", QString().sprintf("(DROPBOX_ID=%d)&&",import_persistent_dropbox_id)+
import_persistent_dropbox_id, "(FILE_PATH=\""+RDEscapeString(filename)+"\")";
(const char *)RDEscapeString(filename));
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
dt=q->value(0).toDateTime(); dt=q->value(0).toDateTime();
@ -1941,20 +1940,16 @@ void MainObject::WriteTimestampCache(const QString &filename,
return; return;
} }
if(GetCachedTimestamp(filename).isNull()) { if(GetCachedTimestamp(filename).isNull()) {
sql=QString().sprintf("insert into DROPBOX_PATHS set \ sql=QString("insert into DROPBOX_PATHS set ")+
DROPBOX_ID=%d,\ QString().sprintf("DROPBOX_ID=%d,",import_persistent_dropbox_id)+
FILE_PATH=\"%s\",\ "FILE_PATH=\""+RDEscapeString(filename)+"\","+
FILE_DATETIME=%s", "FILE_DATETIME="+RDCheckDateTime(dt,"yyyy-MM-dd hh:mm:ss");
import_persistent_dropbox_id,
(const char *)RDEscapeString(filename),
(const char *)RDCheckDateTime(dt,"yyyy-MM-dd hh:mm:ss"));
} }
else { else {
sql=QString().sprintf("update DROPBOX_PATHS set FILE_DATETIME=%s \ sql=QString("update DROPBOX_PATHS set ")+
where (DROPBOX_ID=%d)&&(FILE_PATH=\"%s\")", "FILE_DATETIME="+RDCheckDateTime(dt,"yyyy-MM-dd hh:mm:ss")+" where "+
(const char *)RDCheckDateTime(dt,"yyyy-MM-dd hh:mm:ss"), QString().sprintf("(DROPBOX_ID=%d)&&",import_persistent_dropbox_id)+
import_persistent_dropbox_id, "(FILE_PATH=\""+RDEscapeString(filename)+"\")";
(const char *)RDEscapeString(filename));
} }
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
delete q; delete q;