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