Index: trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets	(revision 8482)
+++ trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets	(revision 9355)
@@ -38,15 +38,11 @@
 set -C
 
-scriptlog=$runlogpath/$program-$datetime.log
-date >> $scriptlog 2>&1
-
 # check if script is already running
 lockfile=$lockpath/lock-$program.txt
-checklock  >> $scriptlog 2>&1
+checklock 
 
 # get all datasetfiles
 datasetfiles=(`ls $datasetpath/*/*.txt`)
-echo "datasetfiles: "${datasetfiles[@]}  >> $scriptlog 2>&1 
-echo "" >> $scriptlog 2>&1 
+printprocesslog "INFO datasetfiles: "${datasetfiles[@]} 
 
 cd $mars
@@ -66,31 +62,23 @@
    if [ "$no" = "$no3" ]
    then 
-      echo "number in filename and in file are the same -> continue" >> $scriptlog 2>&1 
+      printprocesslog "INFO number in filename and in file are the same -> continue" 
    else
-      echo "number in filename and in file are not the same " >> $scriptlog 2>&1 
-      echo " -> continue with next dataset" >> $scriptlog 2>&1 
       printprocesslog "ERROR number in filename ($no) and file ($no3) are not the same for dataset $no2"
       continue
    fi
    # get source name, comment and observation mode from dataset file
-   source=`grep 'SourceName:' $datasetfile | sed -e 's/SourceName://g' | sed -e 's/ //g' | sed -e 's/#//g'` >> $scriptlog 2>&1 
-   comment=`grep 'Comment:' $datasetfile | sed -e 's/Comment://g'` >> $scriptlog 2>&1 
-   mode=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1 
-   mode2=`echo $mode | grep ^\#` >> $scriptlog 2>&1 
+   source=`grep 'SourceName:' $datasetfile | sed -e 's/SourceName://g' | sed -e 's/ //g' | sed -e 's/#//g'` 
+   comment=`grep 'Comment:' $datasetfile | sed -e 's/Comment://g'` 
+   mode=`grep 'WobbleMode:' $datasetfile` 
+   mode2=`echo $mode | grep ^\#` 
    if [ "$mode2" = "" ]
    then 
-      wobble="Y" >> $scriptlog 2>&1 
+      wobble="Y" 
    else
-      wobble="N" >> $scriptlog 2>&1 
+      wobble="N" 
    fi
-   echo "file: "$datasetfile >> $scriptlog 2>&1 
-   echo "  datasetno:  "$no2 >> $scriptlog 2>&1 
-   echo "  sourcename: "$source >> $scriptlog 2>&1 
-   echo "  wobble:     "$wobble >> $scriptlog 2>&1 
-   echo "  comment:    "$comment >> $scriptlog 2>&1 
-   echo " " >> $scriptlog 2>&1 
    
    insertdatasetpath=$logpath/insertdataset/$no4
-   makedir $insertdatasetpath >> $scriptlog 2>&1
+   makedir $insertdatasetpath 
    insertdatasetlog=$insertdatasetpath/insertdataset-$no3.log
 
@@ -99,20 +87,16 @@
    check0=`root -q -b $macrospath/insertdataset.C+\("\"$no2\""\,"\"$source\""\,"\"$wobble\""\,"\"$comment\""\,kFALSE\) | tee $insertdatasetlog | intgrep`
    case $check0 in 
-      1)   echo " check0=$check0 -> everything ok " >> $scriptlog 2>&1 
-           printprocesslog "INFO dataset $no2 successfully inserted"
+      1)   printprocesslog "INFO dataset $no2 successfully inserted (check0=$check0)"
            ;;
-      3)   echo " check0=$check0 -> everything ok " >> $scriptlog 2>&1 
-           printprocesslog "INFO dataset $no2 exists already"
+      3)   printprocesslog "INFO dataset $no2 exists already (check0=$check0)"
            ;;
-      0)   echo " check1=$check1 -> no connection to db -> continue..." >> $scriptlog 2>&1 
-           printprocesslog "WARN connection to DB failed"
+      0)   printprocesslog "WARN connection to DB failed (check0=$check0)"
            check="no"
            ;;
-      *)   echo " check0=$check0 -> ERROR " >> $scriptlog 2>&1 
-           printprocesslog "ERROR $program.C failed for dataset $no2"
+      *)   printprocesslog "ERROR $program.C failed for dataset $no2 (check0=$check0)"
            ;;
    esac
 done
 
-finish >> $scriptlog 2>&1
+finish