Index: trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles	(revision 7805)
+++ trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles	(revision 7806)
@@ -30,20 +30,49 @@
 # 
 
+user=`whoami`
+source /home/$user/Mars/datacenter/scripts/sourcefile
+
+set -C
+
+program=movingrawfiles
+
+lockfile=$lockpath/lock-$program.txt
+
+scriptlogpath=$logpath/run/$program/`date +%Y`
+makedir $scriptlogpath
+scriptlog=$scriptlogpath/$program-$datetime.log
+
+date >> $scriptlog 2>&1
+
+# check if script is already running
+checklock  >> $scriptlog 2>&1
+
+
 umask 0002
 
 # change permission for files 
-ssh tape@dc07 chmod -R g+w /magic/datacenter/fromtape/rawdata/*
+ssh tape@dc07 chmod -R g+w /magic/datacenter/fromtape/rawdata/* >> $scriptlog 2>&1
 # output for chmod with -v or -c (only changes)
 
 #find directories, which have to be copied
 dirs=`ls /magic/datacenter/fromlapalma/RAWchk/*/*.finished | sed -e 's/RAWchk/RAW/g' | cut -d/ -f1-6`
-# change permission for this dirctories
-ssh lapalma@apollo chmod -R g+w $dirs
-# move directories to the tapedirectory
-mv -v $dirs /magic/datacenter/fromtape/rawdata/
+if [ ! "$dirs" == "" ]
+then
+   # change permission for this dirctories
+   ssh lapalma@apollo chmod -R g+w $dirs >> $scriptlog 2>&1
+   # move directories to the tapedirectory
+   mv -v $dirs /magic/datacenter/fromtape/rawdata/ >> $scriptlog 2>&1 
+fi
 
 
 # find rawfiles
 rawfiles=`find /magic/datacenter/fromtape/rawdata/ -name '*.*'`
+
+if [ "$rawfiles" == "" ]
+then
+   echo "no files to move -> exit" >> $scriptlog 2>&1 
+   finish >> $scriptlog 2>&1 
+fi
+
 for rawfile in $rawfiles
 do 
@@ -52,22 +81,14 @@
    newrawfile=`echo $rawfile | sed -e 's/center\/fromtape\/rawdata/\/rawfiles/g' -e 's/_/\//1' -e 's/_/\//1'`
    newdir=`dirname $newrawfile`
-   if [ ! -d $newdir ]
-   then
-     mkdir -pv $newdir 
-     if [ ! -d $newdir ]
-     then 
-        echo "could not make dir "$newdir
-        exit
-     fi
-   fi
+   makedir $newdir >> $scriptlog 2>&1 
 
-   mv -v $rawfile $newrawfile
-#   if gzip -1c $rawfile > $newrawfile.gz
-#   then 
-#      rm -v $newrawfile
-#      rm -v $rawfile
-#   fi
+   mv -v $rawfile $newrawfile >> $scriptlog 2>&1 
 done
 
-rmdir -v /magic/datacenter/fromtape/rawdata/*
+rmdir -v /magic/datacenter/fromtape/rawdata/* >> $scriptlog 2>&1 
 
+echo "launching filesondisk" >> $scriptlog 2>&1 
+$scriptspath/filesondisk&
+
+finish >> $scriptlog 2>&1
+