Changeset 8741 for trunk/MagicSoft/Mars/callisto.cc

Timestamp:

09/05/07 20:36:37 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/callisto.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/callisto.cc

@@ -61 +61 @@
     gLog << "   --debug-env[=1]           Display untouched resources after program execution" << endl;
     gLog << "   --debug-env=2             Display untouched resources after eventloop setup" << endl;
-    gLog << "   --debug-env=3             Debug setting resources from resource file" << endl;
+    gLog << "   --debug-env=3             Debug setting resources from resource file and command line" << endl;
     gLog << "   --debug-mem               Debug memory usage" << endl << endl;
+    gLog << "   --rc=Name:option          Set or overwrite a resource of the resource file." << endl;
+    gLog << "                             (Note, that this option can be used multiple times." << endl;
     gLog << endl;
     gLog << "   -q                        Quit when job is finished" << endl;
@@ -198 +200 @@
 
     //
-    // check for the right usage of the program
+    // check for the right usage of the program (number of arguments)
     //
     if (arg.GetNumArguments()!=1)
@@ -207 +209 @@
     }
 
+    //
+    // Now we access/read the resource file. This will remove all
+    // --rc= from the list of arguments.
+    //
+    MEnv env(kConfig);
+    if (!env.IsValid())
+    {
+        gLog << err << "ERROR - Reading resource file " << kConfig << "." << endl;
+        return 0xfe;
+    }
+
+    // And move the resource options from the command line to the MEnv
+    if (!env.TakeEnv(arg, kDebugEnv>2))
+        return 0xfd;
+
+    //
+    // check for the right usage of the program (number of options)
+    //
     if (arg.GetNumOptions()>0)
     {
@@ -339 +359 @@
     d->SetBit(MStatusDisplay::kExitLoopOnExit);
     d->SetTitle(kSequence);
-
-    MEnv env(kConfig);
-    if (!env.IsValid())
-    {
-        gLog << err << "Configuration file " << kConfig << " not found." << endl;
-        return 0xfe;
-    }
 
     if (kModeC/* || kUseTest*/)