Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8330)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8331)
@@ -19,4 +19,15 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/02/19 Stefan Ruegamer
+
+   * datacenter/scripts/zipscript
+     - changed server from pegasus to phoenix
+
+   * datacenter/scripts/movingrawfiles
+     - deleted database query. This feature is not used at the moment
+       (as there is no normal web transfer any more) and is still being
+       tested in a separate script
+
+
  2007/02/16
 
Index: trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles	(revision 8330)
+++ trunk/MagicSoft/Mars/datacenter/scripts/movingrawfiles	(revision 8331)
@@ -53,51 +53,8 @@
 if [ ! "$dirs" == "" ]
 then
-   for dir in $dirs
-   do
-      # get number of *.raw files from directory
-      numfiles=`find $dir -type f -name "*.raw" | wc -l`
-      
-      # skip empty directories
-      if [ "$numfiles" == "0" ]
-      then
-         continue
-      fi
-
-      # get date from directory name
-      curdate=`echo $dir | cut -d/ -f6- | sed -e 's/_/-/g'`
-      
-      getdbsetup
-      # get number of runs on this date from db
-      query="select COUNT(*) from RunData where ADDDATE(fRunStart, Interval 12 hour) like '$curdate %'"
-
-      if ! numruns=`mysql -s -u $us --password=$pw --host=hercules $db -e "$query" | tail -1`
-      then
-         echo "ERROR could not query number of runs from rundb -> continue" >> $scriptlog 2>&1 
-         printprocesslog "ERROR could not query number of runs for $curdate from rundb"
-         continue
-      fi
-
-      # Check if number of runs matches. If not, skip this directory
-      if ! [ $numfiles -eq $numruns ]
-      then
-         echo "WARNING" >> $scriptlog 2>&1 
-         echo "Expecting $numruns raw-files for $curdate but found only $numfiles" >> $scriptlog 2>&1 
-         continue
-      fi
-
-      # check for non-raw-files
-      nonraw=`find $dir -type f ! -name "*.raw"`
-      if [ ! "$nonraw" == "" ]
-      then
-         echo "non-raw-files found in $dir" >> $scriptlog 2>&1 
-         printprocesslog "WARNING non-raw-files found in $dir"
-      fi
-
-      # change permission for this directory
-      ssh lapalma@apollo chmod -R g+w $dir >> $scriptlog 2>&1
-      # move directories to the tapedirectory
-      mv -v $dir /magic/datacenter/fromtape/rawdata/ >> $scriptlog 2>&1 
-
-   done
+   # 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
 
Index: trunk/MagicSoft/Mars/datacenter/scripts/zipscript
===================================================================
--- trunk/MagicSoft/Mars/datacenter/scripts/zipscript	(revision 8330)
+++ trunk/MagicSoft/Mars/datacenter/scripts/zipscript	(revision 8331)
@@ -54,5 +54,7 @@
 do 
    echo "zipping $file ..." >> $scriptlog 2>&1
-   if ssh pegasus nice -n 19 gzip -1f $file >> $scriptlog 2>&1
+#   if ssh pegasus nice -n 19 gzip -1f $file >> $scriptlog 2>&1
+   if ssh phoenix nice -n 19 gzip -1f $file >> $scriptlog 2>&1
+
    then 
       chmod a-w $file >> $scriptlog 2>&1