Changeset 9141 for trunk/MagicSoft/Mars/mreport

Timestamp:

10/13/08 15:54:30 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReport.cc (modified) (2 diffs)
• MReportCC.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -167 +167 @@
 //    200510250  | 53813.5 |         |  200603190
 //    200604010  | 53863.5 |         |  200605080
+//    200605190  | 54711.5 |         |  200809030
 //
 Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop, Int_t ver)
@@ -200 +201 @@
         ver=200605080;
 
+    if (ver==200605190 && GetMjd()>54711.5)
+        ver=200809030;
+
     // Interprete body (contents) of report
     const Int_t rc = InterpreteBody(str, ver);

trunk/MagicSoft/Mars/mreport/MReportCC.cc

@@ -114 +114 @@
     if (n!=6)
     {
-        cout << n << endl;
         *fLog << warn << "WARNING - Wrong number of arguments (should be 6)." << endl;
         return kFALSE;
@@ -120 +119 @@
 
     str.Remove(0, len);
+
+    if (ver>=200809030)
+    {
+        if (!CheckTag(str, "SCHEDULE "))
+            return kFALSE;
+
+        str = str.Strip(TString::kBoth);
+
+        // [Sourcename] sourcecategory
+        const Ssiz_t pos1 = str.First(' ');
+        if (pos1<0)
+        {
+            *fLog << warn << "WARNING - Wrong number of arguments (should be 1 or 2)." << endl;
+            return kFALSE;
+        }
+
+        const TString str1 = str(0, pos1);
+
+        str.Remove(0, pos1);
+        str = str.Strip(TString::kBoth);
+
+        if (!str1.IsDigit())
+        {
+            const Ssiz_t pos2 = str.First(' ');
+            if (pos2<0)
+            {
+                *fLog << warn << "WARNING - Wrong number of arguments (should be 1 or 2)." << endl;
+                return kFALSE;
+            }
+
+            const TString str2 = str(0, pos2);
+
+            str.Remove(0, pos2);
+
+            if (!str2.IsDigit())
+            {
+                *fLog << warn << "WARNING - Wrong type of second argument." << endl;
+                return kFALSE;
+            }
+        }
+    }
 
     return kTRUE;