From 37d43268cad2c17bc38c6327f327e2c24c828193 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 21 Jul 2009 09:29:58 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:10.0?=
 =?UTF-8?q?=20380=20Files=20correlati=20=20=20=20=20:cacnv.exe=20(ca3.exe?=
 =?UTF-8?q?=20sistemata=20imperfezione)=20Ricompilazione=20Demo=20:=20[=20?=
 =?UTF-8?q?]=20Commento=20=20=20=20=20=20=20=20=20=20=20=20:corretta=20imp?=
 =?UTF-8?q?recisione:=20configurando=20al=20volo=20l'analitica=20(CA)=20al?=
 =?UTF-8?q?=20momento=20del=20passaggio=20CM->CA,=20il=20programma=20non?=
 =?UTF-8?q?=20rilevava=20la=20configurazione=20appena=20fatta,=20continuan?=
 =?UTF-8?q?do=20a=20richiederla=20instancabilmente!=20Nessuno=20se=20ne=20?=
 =?UTF-8?q?era=20mai=20accorto=20perch=C3=A8=20ci=20vuole=20un=20pazzo=20a?=
 =?UTF-8?q?=20configurare=20l'analitica=20al=20volo=20durante=20il=20trasf?=
 =?UTF-8?q?erimento=20dati!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.65.10.50/trunk@19124 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/ca3700.cpp  | 3 +--
 ca/cacnv.cpp   | 2 +-
 ca/calib01.cpp | 8 ++++++--
 ca/calib01.h   | 4 +++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ca/ca3700.cpp b/ca/ca3700.cpp
index 667737d4d..c015288eb 100755
--- a/ca/ca3700.cpp
+++ b/ca/ca3700.cpp
@@ -1948,8 +1948,7 @@ void TPrint_rendiconto_ca::esporta_csv(TPrint_rendiconto_ca_recordset& rendy, co
 //metodo per accattarsi o' primo livello della configurazione CA
 const TMultilevel_code_info& TPrint_rendiconto_ca::get_first_level() const
 {
-	TConfig& cfg = ca_config();
-	const TString& first_lev = cfg.get("Level(1)");
+  const TString& first_lev = ca_config().get("Level", "ca", 1);
 	const int logic = first_lev == "CDC" ? LF_CDC : LF_COMMESSE;
 	return ca_multilevel_code_info(logic);
 }
diff --git a/ca/cacnv.cpp b/ca/cacnv.cpp
index 50e0cceac..746a3f9f4 100755
--- a/ca/cacnv.cpp
+++ b/ca/cacnv.cpp
@@ -140,7 +140,7 @@ public:
 
 bool TConversione_cm2ca::test_configuration()
 {
-  const TString& first_level = ca_config().get("Level", "ca", 1);
+  const TString& first_level = ca_config(true).get("Level", "ca", 1);
   return first_level.not_empty();
 }
 
diff --git a/ca/calib01.cpp b/ca/calib01.cpp
index 43f641adf..3e95ec384 100755
--- a/ca/calib01.cpp
+++ b/ca/calib01.cpp
@@ -71,11 +71,15 @@ const TString& TConfig_anal::get(const char* varname, const char* section, int i
   return tmp;
 }
 
-TConfig& ca_config()
+TConfig& ca_config(bool force)
 {
   static TConfig_anal* cfg = NULL;
-  if (cfg == NULL)
+  if (cfg == NULL || force)
+  {
+    if (cfg != NULL)
+      delete cfg;
     cfg = new TConfig_anal;
+  }
   return *cfg;
 }
 
diff --git a/ca/calib01.h b/ca/calib01.h
index 89c589fdc..16e1c38e6 100755
--- a/ca/calib01.h
+++ b/ca/calib01.h
@@ -21,7 +21,9 @@ class TBill;
 //  TConfig_anal
 ///////////////////////////////////////////////////////////
 
-TConfig& ca_config();
+TConfig& ca_config(bool force = false);
+ //il bool=true serve in caso di cambio di configurazione al volo nel programma di importazione da CM a CA, in modo da..
+//..rilevare subito la configurazione cambiata senza dover uscire e rientrare dal programma
 
 ///////////////////////////////////////////////////////////
 //  TConfig_anal