Switched to xml for InfinityQS export
Now relying on pipeline to copy files from file shares for ghost-pcl and linc-pdfc pdftext-stripper logic is already ordered and now looping exiting text files is also ordered
This commit is contained in:
@ -179,7 +179,7 @@ public class FileRead : Shared.FileRead, IFileRead
|
||||
WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
|
||||
}
|
||||
|
||||
private void FileCopy<T>(string reportFullPath, DateTime dateTime, List<T> descriptions) where T : Shared.Properties.IDescription
|
||||
private void WriteFile<T>(string reportFullPath, DateTime dateTime, ProcessDataStandardFormat processDataStandardFormat, List<T> descriptions) where T : Shared.Properties.IDescription
|
||||
{
|
||||
bool isDummyRun = false;
|
||||
string successDirectory = string.Empty;
|
||||
@ -187,20 +187,19 @@ public class FileRead : Shared.FileRead, IFileRead
|
||||
string duplicateDirectory = Path.Combine(_FileConnectorConfiguration.SourceFileLocation, _CellInstanceName);
|
||||
if (!Directory.Exists(duplicateDirectory))
|
||||
_ = Directory.CreateDirectory(duplicateDirectory);
|
||||
string duplicateFile = Path.Combine(duplicateDirectory, Path.GetFileName(reportFullPath));
|
||||
string lines = File.ReadAllText(reportFullPath);
|
||||
lines = lines
|
||||
.Replace("ppm\t", "\t")
|
||||
.Replace("mm2\t", "\t")
|
||||
.Replace("um\t", "\t")
|
||||
.Replace("mm\t", "\t")
|
||||
.Replace("nm\t", "\t")
|
||||
.Replace("\t[ ", "\t")
|
||||
.Replace("\t*0", "\t")
|
||||
.Replace("\t*", "\t")
|
||||
.Replace("%\t", "\t")
|
||||
.Replace("]\t", "\t");
|
||||
File.WriteAllText(duplicateFile, lines);
|
||||
string duplicateFile = Path.Combine(duplicateDirectory, $"{Path.GetFileName(reportFullPath)}.xml");
|
||||
string xml = ProcessDataStandardFormat.GetXml(processDataStandardFormat)
|
||||
.Replace("ppm</", "</")
|
||||
.Replace("mm2</", "</")
|
||||
.Replace("um</", "</")
|
||||
.Replace("mm</", "</")
|
||||
.Replace("nm</", "</")
|
||||
.Replace(">[ ", ">")
|
||||
.Replace(">*0", ">")
|
||||
.Replace(">*", ">")
|
||||
.Replace("%</", "</")
|
||||
.Replace("]</", "</");
|
||||
File.WriteAllText(duplicateFile, xml);
|
||||
WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);
|
||||
}
|
||||
|
||||
@ -213,11 +212,11 @@ public class FileRead : Shared.FileRead, IFileRead
|
||||
JsonElement[] jsonElements = ProcessDataStandardFormat.GetArray(processDataStandardFormat);
|
||||
List<pcl.Description> descriptions = pcl.ProcessData.GetDescriptions(jsonElements);
|
||||
Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
|
||||
results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics[0]), tests, jsonElements, new List<FileInfo>());
|
||||
results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(string.Join(Environment.NewLine, processDataStandardFormat.Logistics), tests, jsonElements, new List<FileInfo>());
|
||||
if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
|
||||
SaveIQSFile(reportFullPath, dateTime, descriptions, tests);
|
||||
if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
|
||||
FileCopy(reportFullPath, dateTime, descriptions);
|
||||
WriteFile(reportFullPath, dateTime, processDataStandardFormat, descriptions);
|
||||
return results;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user