Compare commits

...

9 Commits

Author SHA1 Message Date
Samuele Locatelli 6a512b14b6 Merge branch 'release/FixDWrap' 2021-09-17 13:06:50 +02:00
Samuele Locatelli 51aaba515f update init datawrap x errore login utente 2021-09-17 13:06:19 +02:00
Samuele Locatelli 05d38253a2 Merge tag 'fixEmptyRedisVal' into develop
Fix per permettere scrittura valore vuoto su REDIS
2021-08-19 12:08:24 +02:00
Samuele Locatelli 8b2be815a5 Merge branch 'release/fixEmptyRedisVal' 2021-08-19 12:08:05 +02:00
Samuele Locatelli 81704a5182 permesso di reset valori REDIS 2021-08-19 12:07:37 +02:00
Samuele Locatelli e0ab2cf853 Merge tag 'fixSe' into develop
Fix setRSV x caso chaive empty
2021-08-19 11:34:11 +02:00
Samuele Locatelli 21eec2959c Merge branch 'release/fixSe' 2021-08-19 11:33:57 +02:00
Samuele Locatelli 2011d1104c Update s evitare eccezioni in setRSV se key empty 2021-08-19 11:33:25 +02:00
Samuele Locatelli f6fb374c23 Merge tag 'ReloadAppConfFix' into develop
Riprostinato metodo init appConf
2021-08-11 15:27:23 +02:00
4 changed files with 1303 additions and 1208 deletions
+7
View File
@@ -2144,6 +2144,8 @@ namespace SteamWare.IO
public bool setRSV(string chiave, string valore) public bool setRSV(string chiave, string valore)
{ {
bool answ = false; bool answ = false;
if (!string.IsNullOrEmpty(chiave))
{
try try
{ {
cache.StringSet(chiave, valore); cache.StringSet(chiave, valore);
@@ -2153,6 +2155,11 @@ namespace SteamWare.IO
{ {
Logging.Instance.Error(string.Format("Eccezzione in setRSV:{0}{1}", Environment.NewLine, exc)); Logging.Instance.Error(string.Format("Eccezzione in setRSV:{0}{1}", Environment.NewLine, exc));
} }
}
else
{
Logging.Instance.Error("Errore: chiave non valida (vuota) in setRSV");
}
return answ; return answ;
} }
+181 -147
View File
@@ -8,12 +8,91 @@ namespace SteamWare
/// </summary> /// </summary>
public class DataWrap public class DataWrap
{ {
#region area protected #region Public Fields
/// <summary>
/// classe singleton x la gestione dei tableadapters
/// </summary>
public static DataWrap DW = new DataWrap();
/// <summary>
/// oggetto vocabolario organizzato come dizionario con chiave lang#lemma e valore la traduzione
/// </summary>
public Dictionary<string, string> dictVocabolario;
/// <summary>
/// table adapter Devices utente
/// </summary>
public DS_devicesTableAdapters.AnagDevicesTableAdapter taAnagDev;
/// <summary>
/// tableAdapter CdC
/// </summary>
public DataLayer_AnagGenTableAdapters.CDCTableAdapter taCdc;
/// <summary>
/// tableAdapter diritti
/// </summary>
public DataLayer_AnagGenTableAdapters.DIRITTITableAdapter taDiritti;
/// <summary>
/// tableAdapter funzione
/// </summary>
public DataLayer_AnagGenTableAdapters.FUNZIONETableAdapter taFunzione;
/// <summary>
/// table adapter lingue
/// </summary>
public DataLayer_genericTableAdapters.LingueTableAdapter taLingue;
/// <summary>
/// table adapter versione anagrafica
/// </summary>
public DataLayer_AnagGenTableAdapters.LogUpdateDbTableAdapter taLogAna;
/// <summary>
/// table adapter versione vocabolario
/// </summary>
public DataLayer_genericTableAdapters.LogUpdateDbTableAdapter taLogVoc;
/// <summary>
/// tableAdapter permessi
/// </summary>
public DataLayer_AnagGenTableAdapters.PermessiTableAdapter taPermessi;
/// <summary>
/// tableAdapter permessi2funzione
/// </summary>
public DataLayer_AnagGenTableAdapters.Permessi2FunzioneTableAdapter taPermessi2Funzione;
/// <summary>
/// tableAdapter userData (user/pwd)
/// </summary>
public DataLayer_AnagGenTableAdapters.UserDataTableAdapter taUserData;
/// <summary>
/// tableAdapter userDataExt (user/pwd)
/// </summary>
public DataLayer_AnagGenTableAdapters.UserDataExtTableAdapter taUserDataExt;
/// <summary>
/// tableAdapter utenti
/// </summary>
public DataLayer_AnagGenTableAdapters.UTENTETableAdapter taUtente;
/// <summary>
/// table adapter vocabolario
/// </summary>
public DataLayer_genericTableAdapters.VocabolarioTableAdapter taVocabolario;
#endregion Public Fields
#region Public Constructors
/// <summary> /// <summary>
/// metodo protected di avvio della classe /// metodo protected di avvio della classe
/// </summary> /// </summary>
protected DataWrap() public DataWrap()
{ {
// inizializzo i table adapters // inizializzo i table adapters
avvioTableAdaptersBase(); avvioTableAdaptersBase();
@@ -23,6 +102,65 @@ namespace SteamWare
setupVocabolario(); setupVocabolario();
} }
#endregion Public Constructors
#region Public Properties
/// <summary>
/// elenco lingue ammesse da vocabolario...
/// </summary>
public DataLayer_generic.LingueDataTable lingue
{
get
{
return taLingue.GetData();
}
}
/// <summary>
/// restituisce conteggio numero record dell'oggetto vocabolario
/// </summary>
public int numRecVoc
{
get
{
int answ = 0;
try
{
answ = dictVocabolario.Count;
}
catch
{ }
return answ;
}
}
/// <summary>
/// Verifica se il vocabolario sia ok...
/// </summary>
public bool vocabolarioOk
{
get
{
bool answ = false;
try
{
answ = (dictVocabolario != null);
if (answ)
{
answ = dictVocabolario.Count > 0;
}
}
catch
{ }
return answ;
}
}
#endregion Public Properties
#region Protected Methods
/// <summary> /// <summary>
/// procedura di avvio dei tableAdapter /// procedura di avvio dei tableAdapter
/// </summary> /// </summary>
@@ -32,6 +170,7 @@ namespace SteamWare
taVocabolario = new DataLayer_genericTableAdapters.VocabolarioTableAdapter(); taVocabolario = new DataLayer_genericTableAdapters.VocabolarioTableAdapter();
taLogVoc = new DataLayer_genericTableAdapters.LogUpdateDbTableAdapter(); taLogVoc = new DataLayer_genericTableAdapters.LogUpdateDbTableAdapter();
} }
/// <summary> /// <summary>
/// procedura di avvio dei tableAdapter /// procedura di avvio dei tableAdapter
/// </summary> /// </summary>
@@ -48,6 +187,32 @@ namespace SteamWare
taLogAna = new DataLayer_AnagGenTableAdapters.LogUpdateDbTableAdapter(); taLogAna = new DataLayer_AnagGenTableAdapters.LogUpdateDbTableAdapter();
taAnagDev = new DS_devicesTableAdapters.AnagDevicesTableAdapter(); taAnagDev = new DS_devicesTableAdapters.AnagDevicesTableAdapter();
} }
/// <summary>
/// prende l'oggetto tabVocabolario in ram e lo trasforma in dictionary
/// </summary>
/// <returns></returns>
protected Dictionary<string, string> ricaricaDictVocabolario()
{
// continuo
Dictionary<string, string> answ = new Dictionary<string, string>();
if (taVocabolario == null)
{
foreach (DataLayer_generic.VocabolarioRow riga in DW.taVocabolario.GetData())
{
answ.Add(riga.Lingua.ToUpper() + "#" + riga.Lemma.ToUpper(), riga.Traduzione);
}
}
else
{
foreach (DataLayer_generic.VocabolarioRow riga in taVocabolario.GetData())
{
answ.Add(riga.Lingua.ToUpper() + "#" + riga.Lemma.ToUpper(), riga.Traduzione);
}
}
return answ;
}
/// <summary> /// <summary>
/// effettua setup dei connection strings da web.config delal singola applicazione /// effettua setup dei connection strings da web.config delal singola applicazione
/// </summary> /// </summary>
@@ -59,6 +224,7 @@ namespace SteamWare
taVocabolario.Connection.ConnectionString = connStr; taVocabolario.Connection.ConnectionString = connStr;
taLogVoc.Connection.ConnectionString = connStr; taLogVoc.Connection.ConnectionString = connStr;
} }
/// <summary> /// <summary>
/// effettua setup dei connection strings da web.config della singola applicazione /// effettua setup dei connection strings da web.config della singola applicazione
/// </summary> /// </summary>
@@ -79,6 +245,7 @@ namespace SteamWare
taPermessi.Connection.ConnectionString = connStrPerm; taPermessi.Connection.ConnectionString = connStrPerm;
taPermessi2Funzione.Connection.ConnectionString = connStrPerm; taPermessi2Funzione.Connection.ConnectionString = connStrPerm;
} }
/// <summary> /// <summary>
/// setup delle tabelle vocabolario /// setup delle tabelle vocabolario
/// </summary> /// </summary>
@@ -112,120 +279,9 @@ namespace SteamWare
logger.lg.scriviLog(string.Format("Caricati {0} lemmi!", dictVocabolario.Count)); logger.lg.scriviLog(string.Format("Caricati {0} lemmi!", dictVocabolario.Count));
} }
/// <summary> #endregion Protected Methods
/// prende l'oggetto tabVocabolario in ram e lo trasforma in dictionary
/// </summary>
/// <returns></returns>
protected Dictionary<string, string> ricaricaDictVocabolario()
{
// continuo
Dictionary<string, string> answ = new Dictionary<string, string>();
if (taVocabolario == null)
{
foreach (DataLayer_generic.VocabolarioRow riga in DW.taVocabolario.GetData())
{
answ.Add(riga.Lingua.ToUpper() + "#" + riga.Lemma.ToUpper(), riga.Traduzione);
}
}
else
{
foreach (DataLayer_generic.VocabolarioRow riga in taVocabolario.GetData())
{
answ.Add(riga.Lingua.ToUpper() + "#" + riga.Lemma.ToUpper(), riga.Traduzione);
}
}
return answ;
}
#endregion #region Public Methods
#region area public
/// <summary>
/// tableAdapter diritti
/// </summary>
public DataLayer_AnagGenTableAdapters.DIRITTITableAdapter taDiritti;
/// <summary>
/// tableAdapter permessi
/// </summary>
public DataLayer_AnagGenTableAdapters.PermessiTableAdapter taPermessi;
/// <summary>
/// tableAdapter funzione
/// </summary>
public DataLayer_AnagGenTableAdapters.FUNZIONETableAdapter taFunzione;
/// <summary>
/// tableAdapter permessi2funzione
/// </summary>
public DataLayer_AnagGenTableAdapters.Permessi2FunzioneTableAdapter taPermessi2Funzione;
/// <summary>
/// tableAdapter CdC
/// </summary>
public DataLayer_AnagGenTableAdapters.CDCTableAdapter taCdc;
/// <summary>
/// tableAdapter utenti
/// </summary>
public DataLayer_AnagGenTableAdapters.UTENTETableAdapter taUtente;
/// <summary>
/// tableAdapter userData (user/pwd)
/// </summary>
public DataLayer_AnagGenTableAdapters.UserDataTableAdapter taUserData;
/// <summary>
/// tableAdapter userDataExt (user/pwd)
/// </summary>
public DataLayer_AnagGenTableAdapters.UserDataExtTableAdapter taUserDataExt;
/// <summary>
/// table adapter lingue
/// </summary>
public DataLayer_genericTableAdapters.LingueTableAdapter taLingue;
/// <summary>
/// table adapter vocabolario
/// </summary>
public DataLayer_genericTableAdapters.VocabolarioTableAdapter taVocabolario;
/// <summary>
/// table adapter versione vocabolario
/// </summary>
public DataLayer_genericTableAdapters.LogUpdateDbTableAdapter taLogVoc;
/// <summary>
/// table adapter versione anagrafica
/// </summary>
public DataLayer_AnagGenTableAdapters.LogUpdateDbTableAdapter taLogAna;
/// <summary>
/// table adapter Devices utente
/// </summary>
public DS_devicesTableAdapters.AnagDevicesTableAdapter taAnagDev;
/// <summary>
/// oggetto vocabolario organizzato come dizionario con chiave lang#lemma e valore la traduzione
/// </summary>
public Dictionary<string, string> dictVocabolario;
/// <summary>
/// resetta il vocabolario rileggendo i dati...
/// </summary>
public void resetVocabolario()
{
memLayer.ML.emptyCacheVal("dictVocabolario");
setupVocabolario();
}
/// <summary>
/// Verifica se il vocabolario sia ok...
/// </summary>
public bool vocabolarioOk
{
get
{
bool answ = false;
try
{
answ = (dictVocabolario != null);
if (answ)
{
answ = dictVocabolario.Count > 0;
}
}
catch
{ }
return answ;
}
}
/// <summary> /// <summary>
/// crea nel db corrente il lemma richiesto e lo valorizza come "--{0}--" /// crea nel db corrente il lemma richiesto e lo valorizza come "--{0}--"
@@ -239,38 +295,16 @@ namespace SteamWare
taVocabolario.Insert(rigaLingua.Lingua, lemma, string.Format("--{0}--", lemma)); taVocabolario.Insert(rigaLingua.Lingua, lemma, string.Format("--{0}--", lemma));
} }
} }
/// <summary>
/// restituisce conteggio numero record dell'oggetto vocabolario
/// </summary>
public int numRecVoc
{
get
{
int answ = 0;
try
{
answ = dictVocabolario.Count;
}
catch
{ }
return answ;
}
}
/// <summary>
/// elenco lingue ammesse da vocabolario...
/// </summary>
public DataLayer_generic.LingueDataTable lingue
{
get
{
return taLingue.GetData();
}
}
/// <summary>
/// classe singleton x la gestione dei tableadapters
/// </summary>
public static DataWrap DW = new DataWrap();
#endregion /// <summary>
/// resetta il vocabolario rileggendo i dati...
/// </summary>
public void resetVocabolario()
{
memLayer.ML.emptyCacheVal("dictVocabolario");
setupVocabolario();
}
#endregion Public Methods
} }
} }
+8 -1
View File
@@ -2161,6 +2161,8 @@ namespace SteamWare
public bool setRSV(string chiave, string valore) public bool setRSV(string chiave, string valore)
{ {
bool answ = false; bool answ = false;
if (!string.IsNullOrEmpty(chiave))
{
try try
{ {
cache.StringSet(chiave, valore); cache.StringSet(chiave, valore);
@@ -2168,7 +2170,12 @@ namespace SteamWare
} }
catch (Exception exc) catch (Exception exc)
{ {
logger.lg.scriviLog(string.Format($"Errore in setRSV | chiave: {chiave} | valore: {valore}{Environment.NewLine}{exc}"), tipoLog.EXCEPTION); logger.lg.scriviLog($"Eccezzione in setRSV | chiave: {chiave} | valore: {valore}{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
}
}
else
{
logger.lg.scriviLog("Errore: chiave non valida (vuota) in setRSV", tipoLog.ERROR);
} }
return answ; return answ;
} }
+927 -880
View File
File diff suppressed because it is too large Load Diff