Index: trunk/MagicSoft/Mars/datacenter/scripts/fillganymed
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/fillganymed	(revision 7471)
+++ trunk/MagicSoft/Mars/datacenter/scripts/fillganymed	(revision 7476)
@@ -44,11 +44,7 @@
 table=DataSetProcessStatus
 column=fFillGanymed
-date=NULL
-datetime=`date +%F-%H-%M-%S`
-year=`date +%Y`
 
 todofile=$listpath/ToDo-$table-$column.txt
-getstatuslogpath=$logpath/getstatus/$program/$year
-getstatuslog=$getstatuslogpath/getstatus-$program-$datetime.log
+lockfile=$lockpath/lock-$program.txt
 
 scriptlogpath=$logpath/run/$program/`date +%Y/%m/%d`
@@ -58,10 +54,8 @@
 date >> $scriptlog 2>&1
 
-makedir $getstatuslogpath >> $scriptlog 2>&1
-
 cd $mars
 
 # check if script is already running
-date > $lockpath/lock-$table-$column.txt >> $scriptlog 2>&1
+date > $lockfile >> $scriptlog 2>&1
 checklock0=$?
 case $checklock0 in 
@@ -75,15 +69,5 @@
 
 # get todo list
-echo "getting list..." >> $scriptlog 2>&1
-check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
-
-case $check0 in 
-    1)   echo "check0=$check0 -> everything ok -> run $program" >> $scriptlog 2>&1;;
-    *)   echo "check0=$check0 -> ERROR -> could not get list -> exit" >> $scriptlog 2>&1
-         rm -v $todofile >> $scriptlog 2>&1
-         rm -v $lockpath/lock-$table-$column.txt >> $scriptlog 2>&1
-    	 date  >> $scriptlog 2>&1
-         exit;;
-esac
+getdolist  >> $scriptlog 2>&1
 
 # retrieve datasets from todo file
@@ -92,8 +76,5 @@
 then 
    echo "nothing to do -> exit"  >> $scriptlog 2>&1
-   rm -v $todofile >> $scriptlog 2>&1
-   rm -v $lockpath/lock-$table-$column.txt >> $scriptlog 2>&1
-   date  >> $scriptlog 2>&1
-   exit
+   finish >> $scriptlog 2>&1
 fi
 
@@ -128,9 +109,4 @@
 done
 
-rm -v $todofile >> $scriptlog 2>&1
-rm -v $lockpath/lock-$table-$column.txt >> $scriptlog 2>&1
+finish >> $scriptlog 2>&1
 
-set +C
-
-date  >> $scriptlog 2>&1
-