Changeset 3328 for trunk/MagicSoft/Mars/merpp.cc

Timestamp:

02/26/04 13:31:07 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/merpp.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/merpp.cc

@@ -6 +6 @@
 
 #include "MRawFileRead.h"
+#include "MSqlInsertRun.h"
 #include "MRawFileWrite.h"
 
@@ -60 +61 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << "   merpp [-h] [-?] [-a0] [-vn] [-cn] [-u1]" << endl;
+    gLog << "   merpp [-h] [-?] [-a] [-vn] [-cn] [-u]" << endl;
     gLog << "         inputfile[.rep,[.raw],[.txt]] [outputfile[.root]]" << endl << endl;
     gLog << "     inputfile.raw:  Magic DAQ binary file." << endl;
@@ -70 +71 @@
     gLog << "     -u, --update:                    Update file" << endl;
     gLog << "     -a, --no-colors:                 Do not use Ansii color codes" << endl;
+    gLog << "     --sql=mysql://user:password@url  Insert run into database <raw data only>" << endl;
     gLog << "     --start=yyyy-mm-dd/hh:mm:ss.mmm: Start event time for merpping report files" << endl;
     gLog << "     --stop=yyyy-mm-dd/hh:mm:ss.mmm:  Stop  event time for merpping report files" << endl;
-    gLog << "     --run=#:                         Only merpp data corresponding to this run number" << endl;
+    gLog << "     --run=#:                         Only data corresponding to this run number" << endl;
     gLog << "     -?, -h, --help:                  This help" << endl << endl;
     gLog << "   REMARK: At the moment you can process a .raw _or_ a .rep file, only!" << endl << endl;
 }
 
-// FIXME: Move to MTime (maybe 'InterpreteCmdline'
+// FIXME: Move to MTime (maybe 'InterpreteCmdline')
 MTime AnalyseTime(TString str)
 {
@@ -118 +120 @@
     kTimeStop.SetName("MTimeStop");
 
-    const Int_t kRunNumber = arg.HasOption("--run=") ? arg.GetIntAndRemove("--run=") : -1;
+    const Int_t   kRunNumber   = arg.HasOption("--run=") ? arg.GetIntAndRemove("--run=") : -1;
+    const TString kSqlDataBase(arg.GetStringAndRemove("--sql="));
 
     if (kTimeStart)
@@ -142 +145 @@
     const Bool_t isreport = kNamein.EndsWith(".rep");
     const Bool_t isdc     = kNamein.EndsWith(".txt");
-
-    if (!kNamein.EndsWith(".raw") && !isreport && !isdc)
+    const Bool_t israw    = !isreport && !israw;
+
+    if (!kNamein.EndsWith(".raw") && israw)
         kNamein += ".raw";
 
@@ -151 +155 @@
     if (!kNameout.EndsWith(".root"))
         kNameout += ".root";
+
+    if (!kSqlDataBase.IsNull() && !israw)
+        gLog << warn << "WARNING - Option '--sql=' only valid for raw-files... ignored." << endl;
 
     //
@@ -292 +299 @@
     if (filter)
         tasks.AddToList(filter);
+    if (israw && !kSqlDataBase.IsNull())
+    {
+        MSqlInsertRun *ins = new MSqlInsertRun(kSqlDataBase);
+        ins->SetUpdate();
+        tasks.AddToList(ins);
+    }
     tasks.AddToList(write);
 
@@ -319 +332 @@
     return 0;
 }
-
-