Changeset 7836 for trunk/MagicSoft/Mars/datacenter

Timestamp:

08/02/06 14:03:06 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/scripts/dowebplots (modified) (5 diffs)

trunk/MagicSoft/Mars/datacenter/scripts/dowebplots

@@ -40 +40 @@
 
 datetime=`date +%F-%H-%M-%S`
-webdir=/www/htdocs/datacenter
 
 scriptlogpath=$logpath/run/dowebplots/`date +%Y/%m/%d`
@@ -74 +73 @@
 
 
-#finding all rootfiles in the webdirectory, that were modified in the last 3 days
+#finding all rootfiles in the data directory, that were modified in the last 3 days
 #this are all statusdisplays 
-rootfiles=`find $webdir/$type/ -maxdepth 10 -name '*.root' -mtime -3 | grep -v '_I_' | grep -v '_Y_' | grep -v 'subsystemdata' | grep -v 'star_lapalma' | grep -v 'summary'`
+rootfiles=`find $datapath/$type/ -maxdepth 10 -name '*.root' -mtime -3 | grep -v '_I_' | grep -v '_Y_' | grep -v 'summary'`
 
 #exit if no rootfiles are found
@@ -105 +104 @@
    if [ "$datepsfile" = "" ]
    then
-      echo "date of psfile is empty -> the file $psfile doesn't exist" >> $scriptlog 2>&1
+      echo "date of psfile is empty, i.e. the file $psfile doesn't exist" >> $scriptlog 2>&1
       echo " -> setting date to 0 and producing psfile..." >> $scriptlog 2>&1
       datepsfile=0
@@ -113 +112 @@
    echo "date of rootfile: $daterootfile" >> $scriptlog 2>&1
    echo "date of psfile:   $datepsfile"   >> $scriptlog 2>&1
-
    #if the psfile is newer than the rootfile
    #no plots have to be done -> continue
    if [ "$datepsfile" -gt "$daterootfile" ] >> $scriptlog 2>&1
    then
-      echo "psfile is older than rootfile -> continue " >> $scriptlog 2>&1
+      echo "psfile is newer than rootfile -> continue " >> $scriptlog 2>&1
       continue
    fi
@@ -137 +135 @@
 done
 
-echo "removing old files" >> $scriptlog 2>&1 
-#make sure, that old plots of files, that are already removed from disk, 
-#  are deleted also in the webdirectory
-#this has to be done, as ps and png files are excluded from rsync, and 
-#as rsync is done with --delete option (script /home/operator/condor/webupdate)
-
-#find all directories with plots
-dirs=`find $webdir/$type/* -type d | grep -v merpplogs`
-
-for dir in ${dir[@]}
-do
-   #find psfiles in directory
-   psfiles=`ls $dir/*.ps`
-   #continue, if there are no psfiles
-   if [ "$psfiles" == "" ]
-   then 
-      continue
-   fi
-   
-   for psfile in ${psfiles[@]}
-   do
-      #create name of corresponding rootfile
-      rootfile=`echo $psfile | sed -e 's/.ps$/.root/g'`
-      #delete ps and pngfiles if rootfile is not existing
-      if ! ls $rootfile >> $scriptlog 2>&1 
-      then 
-         echo "deleting old plots for $rootfile..." >> $scriptlog 2>&1 
-         path=`dirname $psfile`
-         rm -v $psfile >> $scriptlog 2>&1 
-         rm -v $path/*.png >> $scriptlog 2>&1 
-      fi
-   done
-done
-
 rm -v $lockfile >> $scriptlog 2>&1