diff --git a/IOB-WIN/IobMTC.cs b/IOB-WIN/IobMTC.cs index fad850c5..b1f7ae2e 100644 --- a/IOB-WIN/IobMTC.cs +++ b/IOB-WIN/IobMTC.cs @@ -223,13 +223,13 @@ namespace IOB_WIN /// /// Effettua traduzione ITEM da LUT recuperata da json configurazione (SPECIFICO MTC) /// + /// /// - /// /// - protected string itemTranslation(string id, string name) + protected string itemTranslation(string tipo, string id) { // !!!FARE!!! tradurre CORRETTAMENTE da lookuptable... x ora fake acccoda.. - string answ = $"{id}_{name}"; + string answ = $"{tipo}_{id}"; return answ; } @@ -240,7 +240,6 @@ namespace IOB_WIN foreach (var deviceStream in document.DeviceStreams) { string sVal = ""; - string uid = ""; string descr = ""; #if false // check su dataItems (conditions + events + samples) @@ -255,20 +254,16 @@ namespace IOB_WIN { } #endif - - - // check su Conditions try { // check su dataItems (conditions + events + samples) foreach (var dataItem in deviceStream.Conditions) { - uid = dataItem.DataItemId; - descr = itemTranslation(uid, dataItem.Name); - sVal = $"CONDITION: {dataItem.Timestamp.ToString()} | Id: {dataItem.DataItemId} | Name: {dataItem.Name} | Val: {dataItem.CDATA}"; + descr = itemTranslation("C", dataItem.DataItemId); + sVal = $"CONDITION: {dataItem.Timestamp.ToString()} | descr: {descr} | Name: {dataItem.Name} | Val: {dataItem.CDATA}"; lgInfo(sVal); - accodaFLog(sVal, qEncodeFLog($"[DYNDATA]CONDITION_{descr}", dataItem.CDATA)); + accodaFLog(sVal, qEncodeFLog(descr, dataItem.CDATA)); } } catch @@ -279,11 +274,10 @@ namespace IOB_WIN // check su dataItems (conditions + events + samples) foreach (var dataItem in deviceStream.Events) { - uid = dataItem.DataItemId; - descr = itemTranslation(uid, dataItem.Name); - sVal = $"EVENT: {dataItem.Timestamp.ToString()} | Id: {dataItem.DataItemId} | Name: {dataItem.Name} | Val: {dataItem.CDATA}"; + descr = itemTranslation("E", dataItem.DataItemId); + sVal = $"EVENT: {dataItem.Timestamp.ToString()} | descr: {descr} | Name: {dataItem.Name} | Val: {dataItem.CDATA}"; lgInfo(sVal); - accodaFLog(sVal, qEncodeFLog($"[DYNDATA]EVENT_{descr}", dataItem.CDATA)); + accodaFLog(sVal, qEncodeFLog(descr, dataItem.CDATA)); } } catch @@ -295,11 +289,10 @@ namespace IOB_WIN // check su dataItems (conditions + events + samples) foreach (var dataItem in deviceStream.Samples) { - uid = dataItem.DataItemId; - descr = itemTranslation(uid, dataItem.Name); - sVal = $"SAMPLE: {dataItem.Timestamp.ToString()} | Id: {dataItem.DataItemId} | Name: {dataItem.Name} | Val: {dataItem.CDATA}"; + descr = itemTranslation("S", dataItem.DataItemId); + sVal = $"SAMPLE: {dataItem.Timestamp.ToString()} | descr: {descr} | Name: {dataItem.Name} | Val: {dataItem.CDATA}"; lgInfo(sVal); - accodaFLog(sVal, qEncodeFLog($"[DYNDATA]SAMPLE_{descr}", dataItem.CDATA)); + accodaFLog(sVal, qEncodeFLog(descr, dataItem.CDATA)); } } catch