phares3757/met08ddupsfs6420
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.47.1 - ISQ query in OI file name

Browse Source
This commit is contained in:
Mike Phares 2022-12-06 08:22:00 -07:00
parent 6a63632bc7
commit c4bf1dcf21
6 changed files with 84 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Adaptation/.vscode/Reactor.js vendored Normal file
View File

@ -0,0 +1,16 @@
// (self.length != 0) ?
// self :
// (getContextData('2', 'cds.PROCESS_JOBID', '') == '-') ?
// self :
// getContextData('2', 'cds.PROCESS_JOBID', '')
getValue(self, self.length, $('dcp.TENCOR1/pcl/MesEntity', ''), $('dcp.TENCOR1/pcl/asdf', ''), getContextData('2', 'cds.PROCESS_JOBID', ''));
function getValue(value, length, mesEntity, recipe, processJobId) {
if (recipe.toUpperCase() === 'adsf')
return mesEntity;
else if (length !== 0 || processJobId === '-')
return value;
else
return processJobId;
}

16
Adaptation/.vscode/psn.js vendored Normal file
View File

@ -0,0 +1,16 @@
// (self.length != 0) ?
// self :
// (getContextData('2', 'cds.PRODUCT', '') == '-') ?
// self :
// getContextData('2', 'cds.PRODUCT', '')
getValue(self, self.length, getContextData('2', 'cds.PRODUCT', ''), $('dcp.TENCOR1/pcl/asdf', ''));
function getValue(value, length, product, recipe) {
if (recipe.toUpperCase() === 'asdf')
return 'asdf';
else if (length !== 0 || product === '-')
return value;
else
return product;
}

15
Adaptation/FileHandlers/OpenInsight/FileRead.cs
View File

@ -245,13 +245,16 @@ public class FileRead : Shared.FileRead, IFileRead
if (descriptions.Any() && tests.Any())
{
string lines = GetLines(_Logistics, descriptions);
;
if (!string.IsNullOrEmpty(lines))
collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines));
_ = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0]);
// string commandText = FromIQS.GetCommandText(_IqsConnectionString, _Logistics, descriptions[0]);
// if (!string.IsNullOrEmpty(commandText))
// collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), commandText));
{
long breakAfter = dateTime.AddSeconds(_BreakAfterSeconds).Ticks;
long preWait = _FileConnectorConfiguration?.FileHandleWaitTime is null ? dateTime.AddMilliseconds(1234).Ticks : dateTime.AddMilliseconds(_FileConnectorConfiguration.FileHandleWaitTime.Value).Ticks;
(long? subGroupId, string _) = FromIQS.GetCommandText(_BreakAfterSeconds, _IqsConnectionString, _Logistics, descriptions[0], breakAfter, preWait);
if (subGroupId is null)
collection.Add(new(new ScopeInfo(tests[0], _OpenInsightFilePattern), lines));
else
collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value}_{_OpenInsightFilePattern}"), lines));
}
}
if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
WaitForFileConsumption(dateTime, descriptions, isDummyRun, successDirectory, duplicateDirectory, collection, duplicateFile);

61
Adaptation/FileHandlers/OpenInsight/FromIQS.cs
View File

@ -1,10 +1,12 @@
using Adaptation.Shared;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Text.Json;
using System.Threading;
namespace Adaptation.FileHandlers.OpenInsight;
@ -13,7 +15,7 @@ public class FromIQS
#nullable enable
private static string GetCommandText(Logistics logistics, pcl.Description description, string dateTime, string? sid)
private static string GetCommandText(Logistics logistics, pcl.Description description, string dateTime, long? subGroupId)
{
StringBuilder result = new();
_ = result
@ -40,8 +42,8 @@ public class FromIQS
.AppendLine(" join [spcepiworld].[dbo].[test_dat] td ")
.AppendLine(" on se.f_test = td.f_test ")
.AppendLine(" where se.f_flag = 0 ");
if (!string.IsNullOrEmpty(sid))
_ = result.Append(" and se.f_sgrp = ").Append(sid).AppendLine(" ");
if (subGroupId is not null)
_ = result.Append(" and se.f_sgrp = ").Append(subGroupId).AppendLine(" ");
_ = result
.Append(" and rd.f_name = '").Append(description.Reactor).AppendLine("' ")
.Append(" and pd.f_name = '").Append(description.PSN).AppendLine("' ")
@ -56,21 +58,20 @@ public class FromIQS
private static StringBuilder GetForJsonPath(string connectionString, string commandText)
{
StringBuilder stringBuilder = new();
using (SqlConnection sqlConnection = new(connectionString))
{
sqlConnection.Open();
using SqlCommand sqlCommand = new(commandText, sqlConnection);
SqlDataReader sqlDataReader = sqlCommand.ExecuteReader(System.Data.CommandBehavior.SequentialAccess);
while (sqlDataReader.Read())
_ = stringBuilder.Append(sqlDataReader.GetString(0));
}
using SqlConnection sqlConnection = new(connectionString);
sqlConnection.Open();
using SqlCommand sqlCommand = new(commandText, sqlConnection);
SqlDataReader sqlDataReader = sqlCommand.ExecuteReader(CommandBehavior.SequentialAccess);
while (sqlDataReader.Read())
_ = stringBuilder.Append(sqlDataReader.GetString(0));
return stringBuilder;
}
internal static string GetCommandText(string connectionString, Logistics logistics, pcl.Description description)
internal static (long?, string) GetCommandText(long breakAfterSeconds, string connectionString, Logistics logistics, pcl.Description description, long breakAfter, long preWait)
{
string result;
string dateTime;
string commandText;
long? result = null;
string dateFormat = pcl.Description.GetDateFormat();
if (DateTime.TryParseExact(description.Date, dateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime dateTimeParsed))
dateTime = dateTimeParsed.ToString("yyyy-MM-dd HH:mm:ss");
@ -78,25 +79,43 @@ public class FromIQS
dateTime = dateTimeParsed.ToString("yyyy-MM-dd HH:mm:ss");
else
dateTime = logistics.DateTimeFromSequence.ToString("yyyy-MM-dd HH:mm:ss");
string commandText = GetCommandText(logistics, description, dateTime, sid: null);
StringBuilder stringBuilder = GetForJsonPath(connectionString, commandText);
commandText = GetCommandText(logistics, description, dateTime, subGroupId: null);
for (short i = 0; i < short.MaxValue; i++)
{
if (DateTime.Now.Ticks > preWait)
break;
Thread.Sleep(100);
}
StringBuilder stringBuilder = new();
for (short z = 0; z < short.MaxValue; z++)
{
stringBuilder = GetForJsonPath(connectionString, commandText);
if (stringBuilder.Length > 0)
break;
if (DateTime.Now.Ticks > breakAfter)
throw new Exception($"After {breakAfterSeconds} seconds, didn't find sub group id!");
Thread.Sleep(250);
}
if (stringBuilder.Length == 0)
result = commandText;
commandText = stringBuilder.ToString();
else
{
JsonElement[]? jsonElements = JsonSerializer.Deserialize<JsonElement[]>(stringBuilder.ToString());
if (jsonElements is null || !jsonElements.Any() || jsonElements[0].ValueKind != JsonValueKind.Object)
result = commandText;
commandText = stringBuilder.ToString();
else
{
JsonProperty[] jsonProperties = jsonElements[0].EnumerateObject().ToArray();
if (!jsonProperties.Any() || jsonProperties[0].Name != "se_sgrp")
result = commandText;
if (!jsonProperties.Any() || jsonProperties[0].Name != "se_sgrp" || !long.TryParse(jsonProperties[0].Value.ToString(), out long subGroupId))
commandText = stringBuilder.ToString();
else
result = GetCommandText(logistics, description, dateTime, sid: jsonProperties[0].Value.ToString());
{
result = subGroupId;
commandText = GetCommandText(logistics, description, dateTime, subGroupId);
}
}
}
return result;
return new(result, commandText);
}
#nullable disable

4
Adaptation/Shared/FileRead.cs
View File

@ -327,7 +327,7 @@ public class FileRead : Properties.IFileRead
{
if (DateTime.Now.Ticks > preWait)
break;
Thread.Sleep(500);
Thread.Sleep(100);
}
if (!moreThanAnHour)
{
@ -373,7 +373,7 @@ public class FileRead : Properties.IFileRead
}
throw new Exception(string.Concat("After {", _BreakAfterSeconds, "} seconds, right side of {", sourceDirectoryCloaking, "} didn't consume file(s) ", stringBuilder));
}
Thread.Sleep(500);
Thread.Sleep(250);
}
}
}

2
Adaptation/_Tests/Static/pcl.cs
View File

@ -40,7 +40,7 @@ public class PCL : LoggingUnitTesting, IDisposable
public void TestDateTime()
{
DateTime dateTime = DateTime.Now;
Assert.IsTrue(dateTime.ToString("MM/dd/yyyy hh:mm:ss tt") == dateTime.ToString());
Assert.IsTrue(dateTime.ToString("M/d/yyyy h:mm:ss tt") == dateTime.ToString());
}
[TestMethod]