diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs index 9f3e2050..844c0372 100644 --- a/MP.FileData/Controllers/FileController.cs +++ b/MP.FileData/Controllers/FileController.cs @@ -153,6 +153,11 @@ namespace MP.FileData.Controllers } Log.Info($"Effettuati {checkDone} controlli"); + // svuoto + fileNew = new List(); + fileChecked = new List(); + fileMod = new List(); + // chiudo return checkDone; } @@ -267,6 +272,7 @@ namespace MP.FileData.Controllers dbResult = localDbCtx .DbSetProgFile .Where(x => x.Path.StartsWith(path) && ((onlyActive == x.Active) || !onlyActive)) + .Include(x => x.Tags) .OrderBy(x => x.Name) .ToList(); } @@ -500,12 +506,21 @@ namespace MP.FileData.Controllers List currTags = localDbCtx.DbSetTags.ToList(); foreach (var item in updFiles) { + // recupero record da DB... + var currItem = localDbCtx + .DbSetProgFile + .Where(x => x.FileId == item.FileId) + .Include(x => x.Tags) + .FirstOrDefault(); +#if false // rimuovo tags vecchi - if (item.Tags != null) + if (currItem.Tags != null) { - item.Tags.Clear(); - localDbCtx.SaveChanges(); - } + currItem.Tags.Clear(); + //localDbCtx.Entry(item).State = EntityState.Modified; + //localDbCtx.SaveChanges(); + } +#endif List Tags = new List(); List Tag4File = new List(); @@ -552,8 +567,11 @@ namespace MP.FileData.Controllers if (Tag4File.Count > 0) { // salvo i tags relativi ai files - item.Tags = Tag4File; + currItem.Tags.Clear(); + currItem.Tags = Tag4File; + //localDbCtx.Entry(currItem).State = EntityState.Modified; } + //localDbCtx.SaveChanges(); } try { diff --git a/MP.Prog/Conf/Rule04.json b/MP.Prog/Conf/Rule04.json index bc0b02a7..565d7c90 100644 --- a/MP.Prog/Conf/Rule04.json +++ b/MP.Prog/Conf/Rule04.json @@ -18,17 +18,13 @@ "<": " ", ">": " " }, - "RegExPattern": "\\b{{fileName}}.{0,2}\\([\\<\\w\\d\\s./\\-=\\+\\>]+\\)", - "RegExRepFileName": true, - "ReplaceCR": true, + "RegExPattern": "", + "RegExRepFileName": false, + "ReplaceCR": false, "Tag2Collect": [ "CNCTYPE", "VENDOR", "MODEL", - "MPIP", - "Customer", - "HostOS", - "HostName", - "HostAddr" + "MPIP" ] } \ No newline at end of file diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj index 5f857bd0..10770f34 100644 --- a/MP.Prog/MP.Prog.csproj +++ b/MP.Prog/MP.Prog.csproj @@ -3,7 +3,7 @@ net6.0 MP.Prog - 6.16.2212.2818 + 6.16.2212.2916 diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor index 6d5526a7..1b0c7119 100644 --- a/MP.Prog/Pages/Archive.razor +++ b/MP.Prog/Pages/Archive.razor @@ -161,7 +161,7 @@
@record.Name
diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html index e3a6abbc..8d0142ad 100644 --- a/MP.Prog/Resources/ChangeLog.html +++ b/MP.Prog/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

Versione: 6.16.2212.2818

+

Versione: 6.16.2212.2916


Note di rilascio:
    diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt index f05364c4..16cbc890 100644 --- a/MP.Prog/Resources/VersNum.txt +++ b/MP.Prog/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2212.2818 +6.16.2212.2916 diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml index eeef5093..f82225e4 100644 --- a/MP.Prog/Resources/manifest.xml +++ b/MP.Prog/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2212.2818 + 6.16.2212.2916 https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html false