Changeset 4680 for trunk/MagicSoft

Timestamp:

08/18/04 11:21:29 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/sql/filldotrbk.C (modified) (10 diffs)
• macros/sql/filldotrun.C (modified) (8 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
    * mbadpixels/MBadPixelsCam.[h,cc]:
      - implemented function to calculate max cluster sizes
+
+   * macros/sql/filldotrbk.C, macros/sql/filldotrun.C:
+     - added return value
 
 

trunk/MagicSoft/Mars/macros/sql/filldotrbk.C

@@ -40 +40 @@
 //   "/data/MAGIC/Period019/ccdata"             would do it for one Period
 //   "/data/MAGIC/Period019/ccdata/2004_05_17"  would do it for a single day
+//   "/data/MAGIC/Period019/ccdata/file.rbk"    would do it for a single file
 //
 // The second argument is the 'dummy-mode'. If it is kTRUE dummy-mode is
@@ -54 +55 @@
 //
 // Make sure, that database and password are corretly set in the macro.
+//
+// Returns 0 in case of failure and 1 in case of success.
 //
 ///////////////////////////////////////////////////////////////////////////
@@ -102 +105 @@
 // insert the entries from this runbook file into the database
 //
-void insert(MSQLServer &serv, Bool_t dummy, TString fname)
+int insert(MSQLServer &serv, Bool_t dummy, TString fname)
 {
     //cout << endl;
@@ -111 +114 @@
     {
         cout << "Could not open file " << fname << endl;
-        return;
+        return 0;
     }
 
@@ -190 +193 @@
         TSQLResult *res = serv.Query(query);
         if (!res)
+        {
             cout << "ERROR: " << query << endl << endl;
-        else
-        {
-            delete res;
-            num++;
-        }
+            return 0;
+        }
+
+        delete res;
+        num++;
 
         entry = "";
@@ -202 +206 @@
     cout << fname(TRegexp("CC_.*.rbk", kFALSE)) << " <" << num << ">";
     cout << (dummy?" DUMMY":"") << endl;
+
+    return 1;
 }
 
@@ -208 +214 @@
 // loop over all files in this path
 //
-void filldotrbk(TString path="/data/MAGIC/Period017/ccdata", Bool_t dummy=kTRUE)
+int filldotrbk(TString path="/data/MAGIC/Period017/ccdata", Bool_t dummy=kTRUE)
 {
     MSQLServer serv("mysql://hercules:d99swMT!@localhost");
@@ -214 +220 @@
     {
         cout << "ERROR - Connection to database failed." << endl;
-        return;
+        return 0;
     }
 
@@ -225 +231 @@
     cout << endl;
 
+    if (path.EndWith(".rbk"))
+        return insert(serv, dummy, path);
+
     MDirIter Next(path, "CC_*.rbk", -1);
     while (1)
@@ -232 +241 @@
             break;
 
-        insert(serv, dummy, name);
-    }
+        if (!insert(serv, dummy, name))
+            return 0;
+    }
+
+    return 1;
 }

trunk/MagicSoft/Mars/macros/sql/filldotrun.C

@@ -47 +47 @@
 //   "/data/MAGIC/Period019/ccdata"             would do it for one Period
 //   "/data/MAGIC/Period019/ccdata/2004_05_17"  would do it for a single day
+//   "/data/MAGIC/Period019/ccdata/file.run"    would do it for a single file
 //
 // The second argument is the 'dummy-mode'. If it is kTRUE dummy-mode is
@@ -63 +64 @@
 //   root -q -l -b filldotrun.C+\(\"path\"\,kFALSE\) 2>&1 | tee filldotrun.log
 //
+// Returns 0 in case of failure and 1 in case of success.
+//
 /////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -152 +155 @@
 {
     ifstream fin(filename);
+    if (!fin)
+    {
+        cout << "Could not open file " << fname << endl;
+        return -1;
+    }
 
     TString strng;
@@ -160 +168 @@
         cout << "First Line: " << strng << endl;
         cout << endl;
-        return 0;
+        return -1;
     }
 
@@ -175 +183 @@
         cout << "Second Line: " << strng << endl;
         cout << endl;
-        return 0;
+        return -1;
     }
 
@@ -387 +395 @@
         {
             cout << query << " - FAILED!" << endl;
-            continue;
+            return -1;
         }
 
@@ -413 +421 @@
     cout << endl;
 
+    if (path.EndsWith(".run"))
+    {
+        cout << name(TRegexp("CC_.*.run", kFALSE)) << flush;
+        Int_t n = insert(serv, dummy, name);
+        cout << " <" << n << "> " << (dummy?"DUMMY":"") << endl;
+
+        return n<0 ? 0 : 1;
+    }
+
     MDirIter Next(path, "CC_*.run", -1);
     while (1)
@@ -421 +438 @@
 
         cout << name(TRegexp("CC_.*.run", kFALSE)) << flush;
-
         Int_t n = insert(serv, dummy, name);
-
         cout << " <" << n << "> " << (dummy?"DUMMY":"") << endl;
-    }
+
+        if (n<0)
+            return 0;
+    }
+
+    return 1;
 }