Index: trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets	(revision 7037)
+++ trunk/MagicSoft/Mars/datacenter/scripts/insertdatasets	(revision 7051)
@@ -36,8 +36,37 @@
 cd /home/operator/Mars.cvs
 
+datetime=`date +%F-%H-%M-%S`
+year=`date +%Y`
+
+scriptlogpath=$logpath/run/insertdatasets/`date +%Y/%m`
+if [ ! -d $scriptlogpath ]
+then
+  mkdir -pv $scriptlogpath 
+  if [ ! -d $scriptlogpath ]
+  then 
+     echo "could not make scriptlogpath "$scriptlogpath 
+     exit
+  fi
+fi
+
+scriptlog=$scriptlogpath/insertdatasets-$datetime.log
+
+date >> $scriptlog 2>&1
+
+date > $lockpath/lock-insertdatasets.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 callisto is running -> exit" >> $scriptlog 2>&1
+         date  >> $scriptlog 2>&1
+         exit;;
+    *)   echo "checklock0=$checklock0 -> something went completely wrong" >> $scriptlog 2>&1;;
+esac
+
 
 datasetfiles=(`ls /magic/datasets/*/*`)
-echo "datasetfiles: "${datasetfiles[@]} 
-echo ""
+echo "datasetfiles: "${datasetfiles[@]}  >> $scriptlog 2>&1 
+echo "" >> $scriptlog 2>&1 
 
 for datasetfile in ${datasetfiles[@]}
@@ -48,31 +77,49 @@
    if [ "$no" = "$no3" ]
    then 
-      echo "number in filename and in file are the same -> continue"
+      echo "number in filename and in file are the same -> continue" >> $scriptlog 2>&1 
    else
-      echo "number in filename and in file are not the same "
-      echo " -> continue with next dataset"
+      echo "number in filename and in file are not the same " >> $scriptlog 2>&1 
+      echo " -> continue with next dataset" >> $scriptlog 2>&1 
       continue
    fi
-   source=`grep 'SourceName:' $datasetfile | sed -e 's/SourceName://g' | sed -e 's/ //g' | sed -e 's/#//g'`
-   mode=`grep 'WobbleMode:' $datasetfile`
-   mode2=`echo $mode | grep ^\#`
+   source=`grep 'SourceName:' $datasetfile | sed -e 's/SourceName://g' | sed -e 's/ //g' | sed -e 's/#//g'` >> $scriptlog 2>&1 
+   mode=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1 
+   mode2=`echo $mode | grep ^\#` >> $scriptlog 2>&1 
    if [ "$mode2" = "" ]
    then 
-      wobble="Y"
+      wobble="Y" >> $scriptlog 2>&1 
    else
-      wobble="N"
+      wobble="N" >> $scriptlog 2>&1 
    fi
-   echo "file: "$datasetfile
-   echo "  datasetno:  "$no2
-   echo "  sourcename: "$source
-   echo "  wobble:     "$wobble
-   echo " "
-#   check0=`root -q -b $macrospath/insertdataset.C+\("\"$no\""\,"\"$source\""\,"\"$type\""\) | tee $insertdatasetlog | grep int | sed -e 's/(int)//'`
-   check0=`root -q -b $macrospath/insertdataset.C+\("\"$no2\""\,"\"$source\""\,"\"$wobble\"",kFALSE\) | grep int | sed -e 's/(int)//'`
+   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 " " >> $scriptlog 2>&1 
+   
+   insertdatasetpath=$logpath/insertdataset/$no3
+   if [ ! -d $insertdatasetpath ]
+      then
+      mkdir -pv $insertdatasetpath >> $scriptlog 2>&1
+      if [ ! -d $insertdatasetpath ]
+      then 
+         echo "could not make insertdatasetpath "$insertdatasetpath >> $scriptlog 2>&1
+         continue
+      fi
+   fi
+   insertdatasetlog=$insertdatasetpath/insertdataset-$no3.log
+   check0=`root -q -b $macrospath/insertdataset.C+\("\"$no2\""\,"\"$source\""\,"\"$wobble\"",kFALSE\) | tee $insertdatasetlog | grep int | sed -e 's/(int)//'`
    case $check0 in 
-      1)   echo "check0=$check0 -> everthing ok ";;
-      *)   echo "check0=$check0 -> ERROR ";;
+      1)   echo "check0=$check0 -> everthing ok " >> $scriptlog 2>&1 ;;
+      *)   echo "check0=$check0 -> ERROR " >> $scriptlog 2>&1 ;;
    esac
 done
 
+rm -v $todofile >> $scriptlog 2>&1 
+rm -v $lockpath/lock-insertdatasets.txt >> $scriptlog 2>&1 
 
+set +C
+
+date  >> $scriptlog 2>&1
+
+