From 80a78d4a2fe5fc2b34186b7aacd24e32eeaf7d82 Mon Sep 17 00:00:00 2001 From: mtollari Date: Mon, 5 Feb 2018 14:32:06 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2012.?= =?UTF-8?q?0=20522=20Files=20correlati=20=20=20=20=20:=20tf=20Commento=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20:=20-=20Sistemata=20creazione?= =?UTF-8?q?=20Database=20TF,=20non=20caricava=20pi=C3=B9=20i=20dati=20di?= =?UTF-8?q?=20default=20-=20Messo=20controllo=20avvio=20solo=20in=20Releas?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/branches/R_10_00@24332 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/tf/tf0100.cpp | 7 +++++-- src/tf/tf0101.cpp | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/tf/tf0100.cpp b/src/tf/tf0100.cpp index 7fd5d8641..6678b4f2f 100644 --- a/src/tf/tf0100.cpp +++ b/src/tf/tf0100.cpp @@ -678,13 +678,13 @@ bool TTrFa_app::create() _dbname.add("sql"); make_dir(_dbname); TString16 d; d.format("TF%05ld.db", prefix().get_codditta()); _dbname.add(d); - + bool create = !_dbname.exist(); _db = xvt_sql_open(_dbname, user(), "", _dbname.path()); if (_db == NULL) return false; // Questa funzione crea/verifica il DB - verifyDB(!_dbname.exist()); + verifyDB(create); return TSkeleton_application::create(); } @@ -725,7 +725,10 @@ bool TTrFa_app::verifyDB(const bool create) if (ok) xvt_sql_commit(_db); else + { xvt_sql_rollback(_db); + fatal_box("Fallita la creazione/aggiornamento del Database"); + } } else return cantread_box(ini); diff --git a/src/tf/tf0101.cpp b/src/tf/tf0101.cpp index 7c15ee588..e87ee50e9 100644 --- a/src/tf/tf0101.cpp +++ b/src/tf/tf0101.cpp @@ -744,7 +744,8 @@ TTrFa_mask::TTrFa_mask(TString msk) : TAutomask(msk), _filter_changed(true) { loadConfig(); - +#ifndef DBG + // Controllo che abbia aggiornato le causali dopo l'ultima patch cg0500 bool ok = ini_get_int(CONFIG_GENERAL, "cg", "Patch") >= 500; if (!ok) @@ -772,4 +773,6 @@ TTrFa_mask::TTrFa_mask(TString msk) fatal_box("Senza effettuare l'aggiornamento non possiamo garantirti il corretto funzionamento del Trasferimento Fatture.\nIl programma sarà terminato."); } + +#endif // !DBG }