summaryrefslogtreecommitdiffstats
path: root/newpicsdialog.cpp
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2012-10-27 13:02:16 +0200
committerArno <am@disconnect.de>2012-10-27 13:02:16 +0200
commitdc7cc269a4fffe43bdac2ae2dc6548fbd1e3bb5e (patch)
tree30de1f390ad33f067ba1cb9872f994df620fd8c6 /newpicsdialog.cpp
parenta4054f1c7b38e5996081efd7583c06ebf7758e61 (diff)
downloadSheMov-dc7cc269a4fffe43bdac2ae2dc6548fbd1e3bb5e.tar.gz
SheMov-dc7cc269a4fffe43bdac2ae2dc6548fbd1e3bb5e.tar.bz2
SheMov-dc7cc269a4fffe43bdac2ae2dc6548fbd1e3bb5e.zip
Fix archiving pictures
Well, what can I say. Lost in recursion and parent pointers. This commit actually boils down to using the proper database tables and inserting the right values. 'Nuff said...
Diffstat (limited to 'newpicsdialog.cpp')
-rw-r--r--newpicsdialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp
index 822065a..0ededef 100644
--- a/newpicsdialog.cpp
+++ b/newpicsdialog.cpp
@@ -40,7 +40,7 @@ void NewPicsDialog::setupDlg(){
mAddFileQ = new QSqlQuery(mDb);
mAddFileQ->prepare("INSERT INTO pics (tfilename, cmd5sum, isize, tformat) VALUES(:fn, :md5, :size, :format)");
mAddMappingQ = new QSqlQuery(mDb);
- mAddMappingQ->prepare("INSERT INTO pics_mappings (ipics_id, imapping_id) VALUES(:picid, :mapid)");
+ mAddMappingQ->prepare("INSERT INTO pics_mappings2 (ipics_id, imappings_parents_id) VALUES(:picid, :mapid)");
//files widget
mFilesWidget = new QWidget;
@@ -138,7 +138,7 @@ void NewPicsDialog::accept(){
if(files.isEmpty()){
return QDialog::accept();
}
- QList<int> mappingIds = mMappingEditWidget->mappingIds();
+ QList<QVariant> parentIds = mMappingEditWidget->model()->columnValues(MappingTreeResultModel::MyId);
mDb.transaction();
foreach(FileData d, files){
mAddFileQ->bindValue(":fn", d.fileName);
@@ -155,9 +155,9 @@ void NewPicsDialog::accept(){
mDb.rollback();
return;
}
- foreach(int mappingId, mappingIds){
+ foreach(QVariant myId, parentIds){
mAddMappingQ->bindValue(":picid", picId);
- mAddMappingQ->bindValue(":mapid", mappingId);
+ mAddMappingQ->bindValue(":mapid", myId);
if(!mAddMappingQ->exec()){
mDb.rollback();
return;