Skip to content

Commit 04b1c61

Browse files
ZSPACE-12104 Remove reduncant properties.
1 parent 8cceaf9 commit 04b1c61

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

MainClass.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ public static void Main(string[] args)
5151
private static void XicParametersParsing(string[] args)
5252
{
5353
XicParameters parameters = new XicParameters();
54-
string singleFile = "D:\\ht\\testdata\\Columbo-PM-22-291-MetIDEFatePhoto-07092022-MA-04B.raw";
54+
string singleFile = null;
5555
string fileDirectory = null;
5656
string outputFile = null;
57-
string outputDirectory = "D:\\ht\\testdata";
57+
string outputDirectory = null;
5858
string logFormatString = null;
5959

6060
var optionSet = new OptionSet
@@ -486,7 +486,7 @@ private static void RegularParametersParsing(string[] args)
486486
var help = false;
487487
var version = false;
488488
string outputFormatString = null;
489-
string metadataFormatString = null;
489+
string metadataFormatString = "1";
490490
string logFormatString = null;
491491
var parseInput = new ParseInput();
492492

@@ -613,7 +613,8 @@ private static void RegularParametersParsing(string[] args)
613613
{
614614
// parse the command line
615615
var extra = optionSet.Parse(args);
616-
616+
parseInput.RawDirectoryPath = "D:\\ht\\testdata";
617+
parseInput.OutputDirectory = "D:\\ht\\testdata\\output";
617618
if (!extra.IsNullOrEmpty())
618619
{
619620
throw new OptionException("Unexpected extra arguments", null);

Writer/MetadataWriter.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ private void WriteJsonMetada(IRawDataPlus rawFile, int firstScanNumber, int last
152152
var metadata = new Metadata();
153153

154154
// File Properties
155-
string filePath = rawFile.FileName;
156-
metadata.addFileProperty(new CVTerm("NCIT:C47922", "NCIT", "Pathname", filePath));
155+
metadata.addFileProperty(new CVTerm("NCIT:C47922", "NCIT", "Pathname", rawFile.FileName));
157156
metadata.addFileProperty(new CVTerm("NCIT:C25714", "NCIT", "Version",
158157
rawFile.FileHeader.Revision.ToString()));
159158
metadata.addFileProperty(new CVTerm("NCIT:C69199", "NCIT", "Content Creation Date",
@@ -342,13 +341,12 @@ private void WriteTextMetadata(IRawDataPlus rawFile, int firstScanNumber, int la
342341
// Get the start and end time from the RAW file
343342
var startTime = rawFile.RunHeaderEx.StartTime;
344343
var endTime = rawFile.RunHeaderEx.EndTime;
345-
string filePath = rawFile.FileName;
346344

347345
// File Properties
348346
var output = new List<string>
349347
{
350348
"#FileProperties",
351-
"RAW File Path=" + filePath,
349+
"RAW File Path=" + rawFile.FileName,
352350
"RAW file version=" + rawFile.FileHeader.Revision,
353351
"Creation date=" + rawFile.FileHeader.CreationDate
354352
};

0 commit comments

Comments
 (0)