From 31ecb827f23d3efa35231659b1bea3f9efdcb84c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 20 Sep 2024 10:07:51 +0200 Subject: [PATCH] Update algoritmo sostituzione eventi con spazio pre/post x evitare duplicati mal interpretati --- Resources/VersNum.txt | 2 +- SMGen.Data/Services/SMGDataService.cs | 6 +++++- SMGen/Properties/PublishProfiles/IIS-PROD.pubxml.user | 2 +- SMGen/SMGen.csproj | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 5f0d04b..76a48db 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2409.1719 +0.9.2409.1809 diff --git a/SMGen.Data/Services/SMGDataService.cs b/SMGen.Data/Services/SMGDataService.cs index c615b16..1c2a931 100644 --- a/SMGen.Data/Services/SMGDataService.cs +++ b/SMGen.Data/Services/SMGDataService.cs @@ -899,7 +899,11 @@ namespace SMGen.Data.Services } else if (eventsFromDb[int.Parse(lineSplit[1].Trim())] != lineSplit[2].Trim()) { - fileTxt = fileTxt.Replace(lineSplit[2].Trim(), eventsFromDb[int.Parse(lineSplit[1].Trim())]); + // definisco i token con spazi prima e dopo x evitare sostituzione token "esempio" ed "esempio_01"... + string sOrig = $" {lineSplit[2].Trim()} "; + string sDest = $" {eventsFromDb[int.Parse(lineSplit[1].Trim())]} "; + fileTxt = fileTxt.Replace(sOrig, sDest); + //fileTxt = fileTxt.Replace(lineSplit[2].Trim(), eventsFromDb[int.Parse(lineSplit[1].Trim())]); evSt2Change.Add(lineSplit[2].Trim(), lineSplit[0].Trim()); } diff --git a/SMGen/Properties/PublishProfiles/IIS-PROD.pubxml.user b/SMGen/Properties/PublishProfiles/IIS-PROD.pubxml.user index c7d07ee..e3ba668 100644 --- a/SMGen/Properties/PublishProfiles/IIS-PROD.pubxml.user +++ b/SMGen/Properties/PublishProfiles/IIS-PROD.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2024-09-17T17:25:38.1089716Z||;True|2024-09-17T17:30:03.3866876+02:00||;True|2023-07-24T16:24:14.2770302+02:00||;True|2023-07-24T16:23:20.6455643+02:00||;True|2023-05-22T15:35:59.9735292+02:00||;False|2023-05-22T15:33:39.4808724+02:00||;True|2023-05-11T17:36:48.1468628+02:00||; + True|2024-09-18T06:56:03.0373948Z||;True|2024-09-17T19:25:38.1089716+02:00||;True|2024-09-17T17:30:03.3866876+02:00||;True|2023-07-24T16:24:14.2770302+02:00||;True|2023-07-24T16:23:20.6455643+02:00||;True|2023-05-22T15:35:59.9735292+02:00||;False|2023-05-22T15:33:39.4808724+02:00||;True|2023-05-11T17:36:48.1468628+02:00||; AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAHBJL+AjnSkKKQcJBrmvYDwAAAAACAAAAAAADZgAAwAAAABAAAABqHjtCI4r9HP4to5TPRtU/AAAAAASAAACgAAAAEAAAAGWTrj6ykvtUZnIZTp5COsMYAAAAHkol9Zhdo3QCFNYyIvyJViyIyNSW1oNCFAAAAEvXT2wDdsDBGFpVXvR5NVA172tk diff --git a/SMGen/SMGen.csproj b/SMGen/SMGen.csproj index d9c7b66..c56d218 100644 --- a/SMGen/SMGen.csproj +++ b/SMGen/SMGen.csproj @@ -5,7 +5,7 @@ enable enable State Machine Generator - 0.9.2409.1719 + 0.9.2409.1809