Changeset 7961

Timestamp:

08/30/06 13:03:36 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/filldotrun.C (modified) (2 diffs)
• datacenter/macros/insertdataset.C (modified) (4 diffs)
• datacenter/scripts/insertdatasets (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -31 +31 @@
      - removed nail 
      - improved logging
+
+   * datacenter/macros/filldotrun.C:
+     - enhanced return-values 
+
+   * datacenter/macros/insertdataset.C:
+     - fixed return-values in case of error
+
+   * datacenter/macros/insertdataset.C, 
+     datacenter/scripts/insertdatasets:
+     - implemented return value for 'exists already in db'
 
 

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

@@ -654 +654 @@
         cout << " <" << n << "> " << (dummy?"DUMMY":"") << endl;
 
-        return n<0 ? 0 : 1;
+        return n<0 ? 2 : 1;
     }
 
@@ -669 +669 @@
 
         if (n<0)
-            return 0;
+            return 2;
     }
 

trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C

@@ -150 +150 @@
         cout << "Error - could not get sourcename from DB -> " << flush;
         cout << "maybe you have the wrong sourcename in your datasetfile" << endl;
-        return 0;
+        return 2;
     }
 
@@ -172 +172 @@
         {
             cout << "Error - could not insert dataset" << endl;
-            return 0;
+            return 2;
         }
         delete res;
@@ -185 +185 @@
         {
             cout << "Error - could not insert dataset" << endl;
-            return 0;
+            return 2;
         }
         delete res;
@@ -192 +192 @@
     {
         cout << number << " already exists... " << endl;
-        return 0;
+        return 3;
     }
 

trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets

@@ -102 +102 @@
            printprocesslog "INFO dataset $no2 successfully inserted"
            ;;
+      3)   echo " check0=$check0 -> everything ok " >> $scriptlog 2>&1 
+           printprocesslog "INFO dataset $no2 exists already"
+           ;;
       0)   echo " check1=$check1 -> no connection to db -> continue..." >> $scriptlog 2>&1 
            printprocesslog "WARN connection to DB failed"