Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avanzamento gestione decodifica tornoss e MTH

Browse Source
This commit is contained in:
Samuele Locatelli
2021-09-14 16:43:20 +02:00
parent 1652697aff
commit 6fe3925ad8
5 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.FileData/Controllers/FileController.cs
+11 -4
View File
@@ -133,7 +133,7 @@ namespace MP.FileData.Controllers
// salvo i NUOVI file
if (fileNew != null && fileNew.Count > 0)
{
FileInsert(idxMacchina, fileNew, 0, currRule);
FileInsert(idxMacchina, path, fileNew, 0, currRule);
Log.Info($"CheckFileArchived S03 | insert {fileNew.Count} files");
}
// aggiorno i file modificati
@@ -276,7 +276,7 @@ namespace MP.FileData.Controllers
/// <param name="newFiles"></param>
/// <param name="rev"></param>
/// <returns></returns>
public bool FileInsert(string idxMacchina, List<FileInfo> newFiles, int rev, SearchRules currRule)
public bool FileInsert(string idxMacchina, string basePath, List<FileInfo> newFiles, int rev, SearchRules currRule)
{
// fare: lettura conf x macchina
Log.Info($"FileInsert S01 per macchina {idxMacchina}: {newFiles.Count} files da valutare");
@@ -324,7 +324,14 @@ namespace MP.FileData.Controllers
}
}
// cerco codice tag da configurazione
Tags = TagsUtils.searchProgComment(fileName, item.FileStringContent, currRule);
if (currRule.Mode == SearchMode.StringOnFile)
{
Tags = TagsUtils.searchProgComment(fileName, item.FileStringContent, currRule);
}
else
{
Tags = TagsUtils.searchPathName(fileName, basePath, currRule);
}
foreach (var tag in Tags)
{
@@ -399,7 +406,7 @@ namespace MP.FileData.Controllers
if (currRule.Name != "ND")
{
// inserisco come REVISIONE
FileInsert(currFile.IdxMacchina, listUpdate, currFile.Rev + 1, currRule);
FileInsert(currFile.IdxMacchina, currMacchina.BasePath, listUpdate, currFile.Rev + 1, currRule);
// archivio vecchio file
currFile.Active = false;