Merge pull request #61 from EagleAglow/main

Fix "-" issue

Author: gcarreno

entries/bfire/src/ConsoleUnit.pas

@@ -71,14 +71,17 @@ function ParseConsoleParams: Boolean;
   // initialize values
   valid := 0;
   ParamOK := false;
+  ParseConsoleParams := false; // default
+  inputFilename := '';
+  outputFilename := '';
   // initialize the params list
   if not Assigned(FParams) then
     FParams := TStringList.Create(dupIgnore, false, false);
 
   J := 0;
   for I := 1 to ParamCount do
   begin
-    if pos('-', ParamStr(I)) > 0 then
+    if pos('-', ParamStr(I)) = 1 then
     begin
       FParams.Add(Copy(ParamStr(I), 2, ParamStr(I).Length));
       inc(J);
@@ -161,7 +164,7 @@ function ParseConsoleParams: Boolean;
   if J = -1 then // send to console
   begin
     // WriteLn(Format(rsErrorMessage, [rsMissingOutputFlag]));
-    outputFilename := 'CONSOLE';
+    outputFilename := '';
     inc(valid);
   end
   else
@@ -171,7 +174,7 @@ function ParseConsoleParams: Boolean;
   end;
 
   // check if everything was provided
-  Result := valid = 2;
+  ParseConsoleParams := valid = 2;
 end;
 
 end.

entries/bfire/src/ProcessUnit.pas

@@ -22,9 +22,9 @@   TStationData = class of TStationDataClass;
 var
   Stations: TStringList;
   start: TDateTime; // for timing
-  
-procedure ProcessFile(inFile: String; outFile: String);
-procedure DumpFile(outFile: String);
+
+procedure ProcessFile(inFile: String; outFile: String; UseStdOut: Boolean);
+procedure DumpFile(outFile: String; UseStdOut: Boolean);
 
 implementation
 
@@ -92,7 +92,7 @@ function MeanFixup(total: Integer; count: Integer): String;
   MeanFixup := RoundTowardPositiveInfinity(Mean);
 end;
 
-procedure DumpFile(outFile: String);
+procedure DumpFile(outFile: String; UseStdOut: Boolean);
 var
   outputFileStream: TFileStream;
   StationCount: Integer;
@@ -105,7 +105,10 @@ procedure DumpFile(outFile: String);
 
 begin
   try
-    outputFileStream := TFileStream.Create(outFile, fmCreate);
+    if Not(UseStdOut) then
+    begin
+      outputFileStream := TFileStream.Create(outFile, fmCreate);
+    end;
     // not used for console
     StationCount := Stations.count;
 
@@ -128,7 +131,7 @@ procedure DumpFile(outFile: String);
       bufferStr := bufferStr + Stations[index] + '=' + IntegerFixup(EntryMin) +
         '/' + MeanFixup(EntrySum, EntryCount) + '/' + IntegerFixup(EntryMax);
 
-      if outFile = 'CONSOLE' then // send to STDOUT, where it gets mangled
+      if UseStdOut then // send to STDOUT, where it gets mangled
       begin
         write(bufferStr);
       end
@@ -140,19 +143,19 @@ procedure DumpFile(outFile: String);
     end;
 
     bufferStr := '}' + Chr(10); // linefeed appears at end of baseline file
-    if outFile = 'CONSOLE' then // send to STDOUT, where it gets mangled
+    if UseStdOut then // send to STDOUT, where it gets mangled
     begin
       write(bufferStr);
     end
     else
     begin
       outputFileStream.WriteBuffer(TEncoding.UTF8.GetBytes(bufferStr),
         TEncoding.UTF8.GetByteCount(bufferStr));
+      outputFileStream.Free;
     end;
-    outputFileStream.Free;
 
   finally
-    if outFile <> 'CONSOLE' then
+    if Not(UseStdOut) then
     begin
       WriteLn;
       WriteLn;
@@ -162,7 +165,7 @@ procedure DumpFile(outFile: String);
 
 end;
 
-procedure ProcessFile(inFile: String; outFile: String);
+procedure ProcessFile(inFile: String; outFile: String; UseStdOut: Boolean);
 
 var
   inputStream: TFileStream;
@@ -179,7 +182,7 @@ procedure ProcessFile(inFile: String; outFile: String);
 
 begin
   InitCities;
-  if outFile <> 'CONSOLE' then
+  if Not(UseStdOut) then
   begin
     WriteLn('Building Weather Station List...');
   end;

entries/bfire/src/bfire.dpr

@@ -11,25 +11,28 @@ uses
 
 var
   keypress: String; // dummy for readln
+  UseStdOut: Boolean;  // True unless output file is defined
 
 begin
+  UseStdOut := True;
   try
     if ParseConsoleParams then
     begin
       inputFilename := ExpandFileName(inputFilename);
-      if outputFilename <> 'CONSOLE' then
+      if outputFilename <> '' then
       begin
+        UseStdOut := False;
         outputFilename := ExpandFileName(outputFilename);
         WriteLn(Format(rsInputFile, [inputFilename]));
         WriteLn(Format(rsOutputFile, [outputFilename]));
         WriteLn;
         start := Now();
       end;
 
-      ProcessFile(inputFilename, outputFilename);
-      DumpFile(outputFilename);
+      ProcessFile(inputFilename, outputFilename, UseStdOut);
+      DumpFile(outputFilename, UseStdOut);
 
-      if outputFilename <> 'CONSOLE' then
+      if Not (UseStdOut) then
       begin
         WriteLn(Format('Total Elapsed: %s', [FormatDateTime('n" min, "s" sec"',
           Now - start)]));
@@ -42,7 +45,7 @@ begin
 
     on E: Exception do
     begin
-      if outputFilename <> 'CONSOLE' then
+      if Not (UseStdOut) then
       begin
         WriteLn(E.ClassName, ': ', E.Message);
         WriteLn('Press ENTER to exit');