OraId, OraDesignation, RawDataId ... related : Fixed the case ORACLE_DB is not defined.
This commit is contained in:
@@ -658,6 +658,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
|
||||
//
|
||||
// log.DebugFormat("Feature vector calculation end, save opto-file start: {0:HH:mm:ss.fff}", DateTime.Now);
|
||||
|
||||
#if ORACLE_DB
|
||||
if (test.RawDataId + repetitionNr * test.RawDataIdRepetMulti != 0)
|
||||
{
|
||||
string relativeDirectory = Path.Combine(StateMachine.CycleStartTimeStamp.ToString("yy"),
|
||||
@@ -673,6 +674,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
|
||||
startIx, endIx, optoData.Length, fileName);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
log.WarnFormat("IperlHead.Stop() startIx={0} endIx={1} len={2} no raw data file", startIx, endIx, optoData.Length);
|
||||
}
|
||||
@@ -748,12 +750,17 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
|
||||
string wmPosition = Name.Substring(5); /// WMPosition is extracted from a component name in form 'iPerl#'
|
||||
if (wmPosition.Length == 1) wmPosition = "0" + wmPosition;
|
||||
string cycleStartTime = StateMachine.CycleStartTimeStamp.ToString("HH_mm_ss");
|
||||
#if ORACLE_DB
|
||||
string[] designations = string.IsNullOrEmpty(test.RawDataDesignation) ? new string[0] : test.RawDataDesignation.Split(new char[] { '~' });
|
||||
int testId = test.RawDataId + repetitionNr * test.RawDataIdRepetMulti;
|
||||
string designation = string.IsNullOrEmpty(test.RawDataDesignation)
|
||||
? testId.ToString(testId > 0 ? "D2" : "D1") /// Name is generated from Id
|
||||
: (designations.Length > repetitionNr - 1) ? designations[repetitionNr - 1] /// Name is from 'RawDataDesignation' parameter
|
||||
: string.Format("{0}{1}", test.Name, repetitionNr); /// Name is form test name and repetition nr.
|
||||
: string.Format("{0}-{1}", designations[0], repetitionNr); /// Name is form test name and repetition nr.
|
||||
#else
|
||||
int testId = 0;
|
||||
string designation = (test.Repeats == 1) ? test.Name : string.Format("{0}-{1}", test.Name, repetitionNr);
|
||||
#endif
|
||||
///
|
||||
/// Return the file name
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user