Changeset 3817 for trunk/MagicSoft/Mars/mreport

Timestamp:

04/23/04 09:29:51 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mreport/MReportRun.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mreport/MReportRun.cc

@@ -59 +59 @@
 Int_t MReportRun::InterpreteBody(TString &str)
 {
-    Int_t len;
-    const Int_t n=sscanf(str.Data(), "%d %n", &fRunNumber, &len);
+    const Int_t pos = str.First(' ');
+    if (pos<0)
+    {
+        *fLog << warn << "WARNING - Token not found." << endl;
+        return kCONTINUE;
+    }
+    const TString tok=str(0, pos);
+
+    str.Remove(0, pos);
+    str = str.Strip(TString::kBoth);
+
+    Int_t len, run;
+    const Int_t n=sscanf(str.Data(), "%d %n", &run, &len);
     if (n!=1)
     {
@@ -68 +79 @@
     str.Remove(0, len);
 
-    if (str.BeginsWith("END"))
+    if (tok=="START")
+    {
+        if (fRunNumber!=-1)
+            *fLog << warn << "WARNING - RUN-REPORT STOP missing." << endl;
+        fRunNumber = run;
+    }
+    if (tok=="STOP")
+    {
+        if (fRunNumber==-1)
+            *fLog << warn << "WARNING - RUN-REPORT START missing." << endl;
         fRunNumber = -1;
+    }
 
-    str.Remove(0, 6);
-    str = str.Strip(TString::kBoth);
     Ssiz_t pos = str.First(' ');
     if (pos<0)