Changeset 8683 for trunk

Timestamp:

08/20/07 16:03:06 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto.cc (modified) (1 diff)
• ganymed.cc (modified) (1 diff)
• mars.cc (modified) (6 diffs)
• showplot.cc (modified) (2 diffs)
• sponde.cc (modified) (1 diff)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/callisto.cc

@@ -202 +202 @@
     if (arg.GetNumArguments()!=1)
     {
+        gLog << warn << "WARNING - Wrong number of arguments..." << endl;
         Usage();
         return 2;

trunk/MagicSoft/Mars/ganymed.cc

@@ -163 +163 @@
     if (arg.GetNumArguments()!=1)
     {
+        gLog << warn << "WARNING - Wrong number of arguments..." << endl;
         Usage();
         return 2;

trunk/MagicSoft/Mars/mars.cc

@@ -52 +52 @@
     gLog << "             sequence (datacenter default if omitted)." << endl << endl;
     gLog << " Options:" << endl;
+    gLog << "   --config=mars.rc:         Change configuration file" << endl;
+    gLog << "                             <not yet implemented!>" << endl;
     gLog.Usage();
-    gLog << "   --config=mars.rc: Change configuration file" << endl;
-    gLog << "                     <not yet implemented!>" << endl;
-    gLog.Usage();
-    gLog << "     -?/-h: This help" << endl << endl;
+    gLog << "   -?/-h:                    This help" << endl << endl;
 }
 
@@ -85 +84 @@
         return 0xff;
 
+    MLog::RedirectErrorHandler(MLog::kColor);
+
     //
     // Evaluate arguments
@@ -93 +94 @@
     StartUpMessage();
 
-    if (arg.HasOption("-?") || arg.HasOption("-h") || arg.GetNumArguments()>1)
+    if (arg.HasOnly("-V") || arg.HasOnly("--version"))
+        return 0;
+
+    if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))
     {
         Usage();
@@ -115 +119 @@
     if (arg.GetNumArguments()>2)
     {
+        gLog << warn << "WARNING - Too many arguments..." << endl;
         Usage();
         return 2;
@@ -122 +127 @@
     // This is to make argv[i] more readable inside the code
     //
-    TString kFilename = arg.GetArgumentStr(0);
-    TString kInpathD  = arg.GetArgumentStr(1);
+    const TString kFilename = arg.GetArgumentStr(0);
+    const TString kInpathD  = arg.GetArgumentStr(1);
 
     //if (!kIsSequence && !InflateRun(kFilename))
@@ -183 +188 @@
     return 0;
 }
- 
-

trunk/MagicSoft/Mars/showplot.cc

@@ -171 +171 @@
     if (arg.GetNumArguments()<1 || arg.GetNumArguments()>2)
     {
+        gLog << warn << "WARNING - Wrong number of arguments..." << endl;
         Usage();
         return 2;
@@ -176 +177 @@
     if (arg.GetNumArguments()==2 && !arg.GetArgumentStr(1).IsDigit())
     {
+        gLog << warn << "WARNING - First argument must not be a number..." << endl;
         Usage();
         return 2;

trunk/MagicSoft/Mars/sponde.cc

@@ -132 +132 @@
     if (arg.GetNumArguments()<2 || arg.GetNumArguments()>3)
     {
+        gLog << warn << "WARNING - Wrong number of arguments..." << endl;
         Usage();
         return 2;

trunk/MagicSoft/Mars/star.cc

@@ -145 +145 @@
     if (arg.GetNumArguments()!=1)
     {
+        gLog << warn << "WARNING - Wrong number of arguments..." << endl;
         Usage();
         return 2;