Changeset 25 for trunk/NewView/CmdLineParameterUnit.pas

Timestamp:

Aug 1, 2006, 8:51:54 PM (19 years ago)

Author:

RBRi

Message:

refactoring for cmd line parameters handling finished

File:

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

trunk/NewView/CmdLineParameterUnit.pas

@@ -47 +47 @@
        ownerWindow : integer;
        windowTitle : string;
-       fileName : string;
-       topic : string;
-    {
-    TopicParam: string;
-    FilenamesParam: TAString;
-    }
+       fileNames : string;
+       topics : string;
 
      public
@@ -62 +58 @@
        FUNCTION getLanguage : string;
        FUNCTION getHelpManagerFlag : boolean;
+       FUNCTION setHelpManagerFlag(aNewValue : boolean) : boolean;
        FUNCTION getHelpManagerWindow : integer;
        FUNCTION getWindowPositionFlag : boolean;
@@ -67 +64 @@
        FUNCTION getOwnerWindow : integer;
        FUNCTION getWindowTitle : string;
-       FUNCTION getFileName : string;
-       FUNCTION getTopic : string;
+       FUNCTION getFileNames : string;
+       FUNCTION getTopics : string;
        PROCEDURE parseCmdLine(aSplittedCmdLine : TStringList);
   end;
@@ -78 +75 @@
  // returns a string containing the whole
  // command line parametes
- FUNCTION splitCmdLineParameter(aCmdLineString : String; var aRC : Integer) : TStringList;
+ FUNCTION splitCmdLineParameter(aCmdLineString : String; var aResult : TStringList) : integer;
 
  // Return true if param matches the form
@@ -145 +142 @@
 
 
+  FUNCTION TCmdLineParameters.setHelpManagerFlag(aNewValue : boolean) : boolean;
+  begin
+       helpManagerFlag := aNewValue;
+       result := helpManagerFlag;
+  end;
+
+
   FUNCTION TCmdLineParameters.getHelpManagerWindow : integer;
   begin
@@ -175 +179 @@
 
 
-  FUNCTION TCmdLineParameters.getFileName : string;
-  begin
-       result := fileName;
-  end;
-
-
-  FUNCTION TCmdLineParameters.getTopic : string;
-  begin
-       result := topic;
+  FUNCTION TCmdLineParameters.getFileNames : string;
+  begin
+       result := fileNames;
+  end;
+
+
+  FUNCTION TCmdLineParameters.getTopics : string;
+  begin
+       result := topics;
   end;
 
@@ -193 +197 @@
       tmpParameterValue : string;
   begin
+      ProfileEvent( 'ParseCommandLineParameters started' );
+
       // reset the whole object
       showUsageFlag := false;
@@ -207 +213 @@
       windowTitle := '';
 
-      filename := '';
-      topic := '';
+      filenames := '';
+      topics := '';
 
       // start parsing
@@ -273 +279 @@
           else
           begin
-               if length(filename) = 0 then
+               if length(filenames) = 0 then
                begin
                    // filename
-                   fileName := tmpParameter;
+                   fileNames := tmpParameter;
                end
                else
                begin
                    // search (topic) parameter... append all remaining thingies
-                   if topic <> '' then
+                   if topics <> '' then
                    begin
-                       topic := topic + ' ';
+                       topics := topics + ' ';
                    end;
-                   topic := topic + tmpParameter;
+                   topics := topics + tmpParameter;
                end;
           end;
       end;
+
+      ProfileEvent('Parameters parsed');
+      ProfileEvent('  Filename(s): ' + fileNames);
+      ProfileEvent('  Topic(s): ' + topics);
+      ProfileEvent( '...done' );
   end;
 
@@ -307 +318 @@
 
 
-FUNCTION splitCmdLineParameter(aCmdLineString : String; var aRC : Integer) : TStringList;
+FUNCTION splitCmdLineParameter(aCmdLineString : String; var aResult : TStringList) : integer;
  CONST
      STATE_BEFORE = 0;
@@ -319 +330 @@
      tmpState : INTEGER;
      tmpCurrentCommand : String;
-     tmpResult : TStringList;
 
   BEGIN
-     aRC := SUCCESS;
-     tmpResult := TStringList.Create;
+     result := SUCCESS;
+     aResult.Clear;
+
      tmpState := 0;
      tmpCurrentCommand := '';
@@ -337 +348 @@
                STATE_INSIDE :
                  begin
-                    tmpResult.add(tmpCurrentCommand);
+                    aResult.add(tmpCurrentCommand);
                     tmpCurrentCommand := '';
                     tmpState := STATE_BEFORE;
@@ -343 +354 @@
                STATE_INSIDE_QUOTED_START_QUOTE :
                  begin
-                    tmpResult.add(tmpCurrentCommand);
+                    aResult.add(tmpCurrentCommand);
                     tmpCurrentCommand := '';
                     tmpState := STATE_BEFORE;
@@ -409 +420 @@
      STATE_INSIDE :
        begin
-          tmpResult.add(tmpCurrentCommand);
+          aResult.add(tmpCurrentCommand);
        end;
      STATE_INSIDE_QUOTED_START_QUOTE :
        begin
-          tmpResult.add(tmpCurrentCommand);
+          aResult.add(tmpCurrentCommand);
        end;
      ELSE
        begin
-          aRC := ERROR_UNMATCHED_QUOTE;
-          tmpResult.add(tmpCurrentCommand);
+          result := ERROR_UNMATCHED_QUOTE;
+          aResult.add(tmpCurrentCommand);
        end;
      end;
-     splitCmdLineParameter:= tmpResult;
   END;
 
@@ -509 +519 @@
 end;
 
+
 END.