Index: trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck	(revision 7460)
+++ trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck	(revision 7465)
@@ -41,4 +41,5 @@
 
 user=`whoami`
+program=datacheck
 source /home/$user/Mars/datacenter/scripts/sourcefile
 
@@ -54,10 +55,10 @@
 
 todofile=$listpath/ToDo-$table-$column
-getstatuslogpath=$logpath/getstatus/dodatacheck/$year
-getstatuslog=$getstatuslogpath/getstatus-dodatacheck-$datetime.log
-
-scriptlogpath=$logpath/run/dodatacheck/`date +%Y/%m`
+getstatuslogpath=$logpath/getstatus/$program/$year
+getstatuslog=$getstatuslogpath/getstatus-$program-$datetime.log
+
+scriptlogpath=$logpath/run/$program/`date +%Y/%m`
 makedir $scriptlogpath
-scriptlog=$scriptlogpath/dodatacheck-$datetime.log
+scriptlog=$scriptlogpath/$program-$datetime.log
 
 date >> $scriptlog 2>&1
@@ -70,12 +71,12 @@
 then 
    echo "other file(s) on disk " >> $scriptlog 2>&1
-   echo " -> choose one file and start datacheck " >> $scriptlog 2>&1
+   echo " -> choose one file and start $program " >> $scriptlog 2>&1
 else
-   date > $lockpath/lock-getting-dodatacheck-list.txt >> $scriptlog 2>&1 
+   date > $lockpath/lock-getting-$program-list.txt >> $scriptlog 2>&1 
    checklock0=$?
    case $checklock0 in 
        0)   echo "checklock0=$checklock0 -> continue " >> $scriptlog 2>&1;;
        1)   echo "checklock0=$checklock0 -> file exists " >> $scriptlog 2>&1
-            echo "-> getting list for dodatacheck is running -> exit" >> $scriptlog 2>&1
+            echo "-> getting list for $program is running -> exit" >> $scriptlog 2>&1
             date  >> $scriptlog 2>&1
             exit;;
@@ -87,8 +88,8 @@
 
    case $check0 in
-      1)   echo "check0=$check0 -> everything ok -> do datacheck" >> $scriptlog 2>&1;;
+      1)   echo "check0=$check0 -> everything ok -> do $program" >> $scriptlog 2>&1;;
       *)   echo "check0=$check0 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1;;
    esac
-   rm -v $lockpath/lock-getting-dodatacheck-list.txt >> $scriptlog 2>&1
+   rm -v $lockpath/lock-getting-$program-list.txt >> $scriptlog 2>&1
 fi
 
@@ -143,5 +144,5 @@
 do 
    date
-   echo "do datacheck for run "$run >> $scriptlog 2>&1
+   echo "do $program for run "$run >> $scriptlog 2>&1
    no=`printf %08d $run | cut -c 0-2`
    no2=`printf %08d $run`
@@ -163,5 +164,5 @@
 
    case $check1 in 
-       1)   echo "check1=$check1 -> everything ok -> go on with datacheck..." >> $scriptlog 2>&1
+       1)   echo "check1=$check1 -> everything ok -> go on with $program..." >> $scriptlog 2>&1
             ;;
        *)   echo "check1=$check1 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1
@@ -185,5 +186,5 @@
       
       case $check2 in 
-          0)   echo "check2=$check2 -> everything ok -> go on with datacheck..." >> $scriptlog 2>&1
+          0)   echo "check2=$check2 -> everything ok -> go on with $program..." >> $scriptlog 2>&1
                ;;
           *)   echo "check2=$check2 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1
@@ -225,18 +226,12 @@
 
    # set status
-   echo "inserting the status for the datacheck for run $run into the db" >> $scriptlog 2>&1
-   setstatuslogpath=$logpath/setstatus/datacheck/$date
-   echo "setstatuslogpath: $setstatuslogpath" >> $scriptlog 2>&1
-   makedir $setstatuslogpath >> $scriptlog 2>&1
-   setstatuslog=$setstatuslogpath/setstatus-datacheck-$no2.log
-   echo "setstatuslogfile: $setstatuslog" >> $scriptlog 2>&1
-
-   check4=`root -q -b $macrospath/setstatus.C+\("\"$run\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog | grep int | sed -e 's/(int)//'`
-   case $check4 in
-      1)   echo "check4=$check4 -> everything ok, status has been set" >> $scriptlog 2>&1
-           ;;
-      *)   echo "check4=$check4 -> ERROR -> step could not be set" >> $scriptlog 2>&1
-           ;;
-   esac
+   echo "inserting the status for the $program for run $run into the db" >> $scriptlog 2>&1
+   statustime="Now()"
+   failed="NULL"
+   starttime="NULL"
+   failedtime="NULL"
+   var1=$date
+   var2=$no2
+   setstatus
 done