Changeset 76 for trunk/NewView/CmdLineParameterUnit.pas

Timestamp:

Feb 12, 2007, 9:35:45 PM (19 years ago)

Author:

RBRi

Message:

improved debug switch handling

File:

• trunk/NewView/CmdLineParameterUnit.pas (modified) (9 diffs)

trunk/NewView/CmdLineParameterUnit.pas

@@ -21 +21 @@
 
  CONST
-     SUCCESS = 0;
-     ERROR_UNMATCHED_QUOTE = -1;
+   ENV_DEBUG = 'NEWVIEW_DEBUG';
+
 
  TYPE EParsingFailed=CLASS(Exception);
@@ -51 +51 @@
        searchText : string;
 
-//       FUNCTION ReadNextPart(const aParseString : String; const aSetOfDelimiterChars : TSetOfChars): String;
        FUNCTION handleSwitchWithValue(const aSwitchString : String; const aSwitch : String; var aValue : String) : Boolean;
        PROCEDURE parseSwitch(aSwitchString : String);
@@ -88 +87 @@
 Implementation
 uses
+  DOS,
   ACLFileUtility;
 
@@ -160 +160 @@
       result := StrTrimChars(result, ['"']);
     end;
-
   end;
 
@@ -181 +180 @@
     tmpSwitch : String;
   begin
-     LogEvent(LogStartup, 'ParseCommandLine: "' + aCmdLineString + '"');
-
-     // store the original string for debugging
-     commandLine := aCmdLineString;
-
-     // reset the whole object
-     showUsageFlag := false;
-     searchFlag := false;
-     globalSearchFlag := false;
-     language := '';
-     helpManagerFlag := false;
-     helpManagerWindow := 0;
-     windowPositionFlag := false;
-     ownerWindow := 0;
-     windowTitle := '';
-     searchText := '';
-     fileNames := '';
-     fileNamesRaw := '';
-
-     try
-       // start parsing
-       tmpState := WHITESPACE;
-       tmpWhitespace := '';
-       tmpSwitch := '';
-       tmpQuote := '';
-       tmpQuoted := false;
-       tmpCurrentParsePosition := 1;
-       while tmpCurrentParsePosition <= length(aCmdLineString) do
-       begin
-         tmpCurrentChar := aCmdLineString[tmpCurrentParsePosition];
-
-         Case tmpCurrentChar of
-           ' ' :
-           begin
-             Case tmpState of
-
-               WHITESPACE :
-               begin
-                 tmpWhitespace := tmpWhitespace + tmpCurrentChar;
-               end;
-
-               QUOTE :
-               begin
-                 tmpQuote := tmpQuote + tmpCurrentChar;
-               end;
-
-               SWITCH :
-               begin
-                 if tmpQuoted then
-                 begin
-                   tmpSwitch := tmpSwitch + tmpCurrentChar;
-                 end
-                 else
-                 begin
-                   parseSwitch(tmpSwitch);
-                   tmpState := WHITESPACE;
-                   tmpWhitespace := tmpCurrentChar;
-                 end
-               end;
-
-               FILENAME :
-               begin
-                 if tmpQuoted then
-                 begin
-                   fileNames := fileNames + tmpCurrentChar;
-                   fileNamesRaw := fileNamesRaw + tmpCurrentChar;
-                 end
-                 else
-                 begin
-                   tmpState := WHITESPACE;
-                   tmpWhitespace := tmpCurrentChar;
-                 end
-               end;
-
-               TEXT :
-               begin
-                 if tmpQuoted then
-                 begin
-                   searchText := searchText + tmpCurrentChar;
-                 end
-                 else
-                 begin
-                   tmpState := WHITESPACE;
-                   tmpWhitespace := tmpCurrentChar;
-                 end
-               end;
-             end;
-           end;
-
-           '/', '-' :
-           begin
-             Case tmpState of
-               WHITESPACE :
-               begin
-                 tmpState := SWITCH;
-                 tmpSwitch := '';
-               end;
-
-               QUOTE :
-               begin
-                 tmpState := SWITCH;
-                 tmpSwitch := '';
-               end;
-
-               SWITCH :
-               begin
-                 parseSwitch(tmpSwitch);
-                 tmpSwitch := '';
-               end;
-
-               FILENAME :
-               begin
-                 fileNames := fileNames + tmpCurrentChar;
-                 fileNamesRaw := fileNamesRaw + tmpCurrentChar;
-               end;
-
-               TEXT :
-               begin
-                 searchText := searchText + tmpCurrentChar;
-               end;
-             end;
-           end;
-
-           '"' :
-           begin
-             if tmpQuoted then
-             begin
-               tmpQuoted := false;
-               Case tmpState of
-                 FILENAME :
-                 begin
-                   fileNamesRaw := fileNamesRaw + tmpCurrentChar;
-                 end;
-               end;
-             end
-             else
-             begin
-               Case tmpState of
-                 WHITESPACE :
-                 begin
-                   tmpState := QUOTE;
-                   tmpQuote := tmpCurrentChar;
-                 end;
-                 FILENAME :
-                 begin
-                   fileNamesRaw := fileNamesRaw + tmpCurrentChar;
-                 end;
-               end;
-               tmpQuoted := true;
-             end;
-           end;
-
-           // any other char
-           else
-           begin
-             Case tmpState of
-
-               WHITESPACE :
-               begin
-                 if length(fileNames) > 0 then
-                 begin
-                   tmpState := TEXT;
-                   searchText := searchText + tmpWhitespace + tmpCurrentChar;
-                 end
-                 else
-                 begin
-                   tmpState := FILENAME;
-                   fileNames := fileNames + tmpCurrentChar;
-                   fileNamesRaw := fileNamesRaw + tmpCurrentChar;
-                 end;
-               end;
-
-               QUOTE :
-               begin
-                 if length(fileNames) > 0 then
-                 begin
-                   tmpState := TEXT;
-                   searchText := searchText + tmpWhitespace + tmpCurrentChar;
-                 end
-                 else
-                 begin
-                   tmpState := FILENAME;
-                   fileNames := fileNames + tmpCurrentChar;
-                   fileNamesRaw := fileNamesRaw + tmpQuote + tmpCurrentChar;
-                 end;
-               end;
-
-               SWITCH :
-               begin
-                 tmpSwitch := tmpSwitch + tmpCurrentChar;
-               end;
-
-               FILENAME :
-               begin
-                 fileNames := fileNames + tmpCurrentChar;
-                 fileNamesRaw := fileNamesRaw + tmpCurrentChar;
-               end;
-
-               TEXT :
-               begin
-                 searchText := searchText + tmpCurrentChar;
-               end;
-             end;
-           end;
+    // first adjust logging
+    if GetEnv(ENV_DEBUG) = '' then
+    begin
+      // TODO set boolean
+    end
+    else
+    begin
+      SetLogAspects(GetEnv(ENV_DEBUG));
+    end;
+
+    LogEvent(LogStartup, 'ParseCommandLine: "' + aCmdLineString + '"');
+
+    // store the original string for debugging
+    commandLine := aCmdLineString;
+
+    // reset the whole object
+    showUsageFlag := false;
+    searchFlag := false;
+    globalSearchFlag := false;
+    language := '';
+    helpManagerFlag := false;
+    helpManagerWindow := 0;
+    windowPositionFlag := false;
+    ownerWindow := 0;
+    windowTitle := '';
+    searchText := '';
+    fileNames := '';
+    fileNamesRaw := '';
+
+    try
+      // start parsing
+      tmpState := WHITESPACE;
+      tmpWhitespace := '';
+      tmpSwitch := '';
+      tmpQuote := '';
+      tmpQuoted := false;
+      tmpCurrentParsePosition := 1;
+      while tmpCurrentParsePosition <= length(aCmdLineString) do
+      begin
+        tmpCurrentChar := aCmdLineString[tmpCurrentParsePosition];
+
+        Case tmpCurrentChar of
+          ' ' :
+          begin
+            Case tmpState of
+
+              WHITESPACE :
+              begin
+                tmpWhitespace := tmpWhitespace + tmpCurrentChar;
+              end;
+
+              QUOTE :
+              begin
+                tmpQuote := tmpQuote + tmpCurrentChar;
+              end;
+
+              SWITCH :
+              begin
+                if tmpQuoted then
+                begin
+                  tmpSwitch := tmpSwitch + tmpCurrentChar;
+                end
+                else
+                begin
+                  parseSwitch(tmpSwitch);
+                  tmpState := WHITESPACE;
+                  tmpWhitespace := tmpCurrentChar;
+                end
+              end;
+
+              FILENAME :
+              begin
+                if tmpQuoted then
+                begin
+                  fileNames := fileNames + tmpCurrentChar;
+                  fileNamesRaw := fileNamesRaw + tmpCurrentChar;
+                end
+                else
+                begin
+                  tmpState := WHITESPACE;
+                  tmpWhitespace := tmpCurrentChar;
+                end
+              end;
+
+              TEXT :
+              begin
+                if tmpQuoted then
+                begin
+                  searchText := searchText + tmpCurrentChar;
+                end
+                else
+                begin
+                  tmpState := WHITESPACE;
+                  tmpWhitespace := tmpCurrentChar;
+                end
+              end;
+            end;
+          end;
+
+          '/', '-' :
+          begin
+            Case tmpState of
+              WHITESPACE :
+              begin
+                tmpState := SWITCH;
+                tmpSwitch := '';
+              end;
+
+              QUOTE :
+              begin
+                tmpState := SWITCH;
+                tmpSwitch := '';
+              end;
+
+              SWITCH :
+              begin
+                parseSwitch(tmpSwitch);
+                tmpSwitch := '';
+              end;
+
+              FILENAME :
+              begin
+                fileNames := fileNames + tmpCurrentChar;
+                fileNamesRaw := fileNamesRaw + tmpCurrentChar;
+              end;
+
+              TEXT :
+              begin
+                searchText := searchText + tmpCurrentChar;
+              end;
+            end;
+          end;
+
+          '"' :
+          begin
+            if tmpQuoted then
+            begin
+              tmpQuoted := false;
+              Case tmpState of
+                FILENAME :
+                begin
+                  fileNamesRaw := fileNamesRaw + tmpCurrentChar;
+                end;
+              end;
+            end
+            else
+            begin
+              Case tmpState of
+                WHITESPACE :
+                begin
+                  tmpState := QUOTE;
+                  tmpQuote := tmpCurrentChar;
+                end;
+                FILENAME :
+                begin
+                  fileNamesRaw := fileNamesRaw + tmpCurrentChar;
+                end;
+              end;
+              tmpQuoted := true;
+            end;
+          end;
+
+          // any other char
+          else
+          begin
+            Case tmpState of
+
+              WHITESPACE :
+              begin
+                if length(fileNames) > 0 then
+                begin
+                  tmpState := TEXT;
+                  searchText := searchText + tmpWhitespace + tmpCurrentChar;
+                end
+                else
+                begin
+                  tmpState := FILENAME;
+                  fileNames := fileNames + tmpCurrentChar;
+                  fileNamesRaw := fileNamesRaw + tmpCurrentChar;
+                end;
+              end;
+
+              QUOTE :
+              begin
+                if length(fileNames) > 0 then
+                begin
+                  tmpState := TEXT;
+                  searchText := searchText + tmpWhitespace + tmpCurrentChar;
+                end
+                else
+                begin
+                  tmpState := FILENAME;
+                  fileNames := fileNames + tmpCurrentChar;
+                  fileNamesRaw := fileNamesRaw + tmpQuote + tmpCurrentChar;
+                end;
+              end;
+
+              SWITCH :
+              begin
+                tmpSwitch := tmpSwitch + tmpCurrentChar;
+              end;
+
+              FILENAME :
+              begin
+                fileNames := fileNames + tmpCurrentChar;
+                fileNamesRaw := fileNamesRaw + tmpCurrentChar;
+              end;
+
+              TEXT :
+              begin
+                searchText := searchText + tmpCurrentChar;
+              end;
+            end;
+          end;
         end;
         inc(tmpCurrentParsePosition);
@@ -395 +404 @@
           parseSwitch(tmpSwitch);
         end;
-     end;
-
-
-     // TODO remove interpreted
-
+      end;
+      // TODO remove interpreted
     except
         on e:EParsingFailed do
@@ -414 +420 @@
     LogEvent(LogStartup, '  Search Text: "' + searchText + '"');
   end;
-
-
-{
-  FUNCTION TCmdLineParameters.ReadNextPart(const aParseString : String; const aSetOfDelimiterChars : TSetOfChars): String;
-  VAR
-    i : integer;
-    tmpChar : char;
-  BEGIN
-    result := '';
-    for i:= currentParsePosition to length(aParseString) do
-    begin
-      tmpChar := aParseString[i];
-      if tmpChar in aSetOfDelimiterChars then
-      begin
-        i := length(aParseString); // stop parsing
-      end
-      else
-      begin
-        result := result + tmpChar;
-      end;
-    end;
-  END;
-}
 
 
@@ -517 +500 @@
   var
     tmpCurrentChar : char;
-    tmpText : String;
     tmpValue : String;
   begin
@@ -578 +560 @@
         begin
           showUsageFlag := true;
-
-          // check for 'help'
-//          tmpText := copy(aCmdLineString, 2, 3);
-//          tmpText := lowercase(tmpText);
-
-//          if ('elp' = tmpText) then
-//          begin
-//          end;
         end;