Index: trunk/DataCheck/Monitoring/CheckDU.sh
===================================================================
--- trunk/DataCheck/Monitoring/CheckDU.sh	(revision 18856)
+++ trunk/DataCheck/Monitoring/CheckDU.sh	(revision 18857)
@@ -8,10 +8,6 @@
 
 # possible limits
-limits=( 209715200 524288000 1073741824 2147483648 )
-texts=(   "200 GB"  "500 GB"     "1 TB"     "2 TB" )
-
-# set standard limits
-lowlimit=1
-highlimit=2
+limits=(  10485760 52428800 104857600 209715200 524288000 1073741824 2147483648 )
+texts=(    "10 GB" "50 GB"   "100 GB"  "200 GB"  "500 GB"     "1 TB"     "2 TB" )
 
 # get paths depending on host
@@ -19,12 +15,24 @@
 #        data) dirs=( "/loc_data" "/daq" "/newdaq" )
         data) dirs=( "/loc_data" )
+              lowlimits=( 4 ) 
+              highlimits=( 5 ) 
               ;;
          daq) dirs=( "/raid10" )
+              lowlimits=( 4 ) 
+              highlimits=( 5 ) 
               ;;
       newdaq) dirs=( "/fact" )
+              lowlimits=( 5 ) 
+              highlimits=( 6 ) 
+              ;;
+     newdata) dirs=( "/scratch" "/data1" "/data2" )
+              lowlimits=( 1 4 4 ) 
+              highlimits=( 2 5 5 ) 
+              lowlimits=( 0 4 4 ) 
+              highlimits=( 1 5 5 ) 
               ;;
    isdc-dl00) dirs=( "/gpfs" "/scratch" )
-              highlimit=1
-              # better: array of limits
+              lowlimits=( 4 ) 
+              highlimits=( 4 ) 
               ;;
            *) echo "no valid host "$HOSTNAME
@@ -36,19 +44,21 @@
 hour=`date +%k`
 
-# define disk space limit for check depending on the time
-if [ $hour -lt 8 ] || [ $hour -gt 15 ]
-then
-   # during night
-   dulimit=${limits[$lowlimit]}
-   dutext=${texts[$lowlimit]}
-else
-   # during day
-   dulimit=${limits[$highlimit]}
-   dutext=${texts[$highlimit]}
-fi
+for (( i=0 ; i< ${#dirs[@]} ; i++ ))
+do 
+   dir=${dirs[$i]}
+   # define disk space limit for check depending on the time
+   if [ $hour -lt 8 ] || [ $hour -gt 15 ]
+   then
+      # during night
+      dulimit=${limits[${lowlimits[$i]}]}
+      dutext=${texts[${lowlimits[$i]}]}
+   else
+      # during day
+      dulimit=${limits[${highlimits[$i]}]}
+      dutext=${texts[${highlimits[$i]}]}
+   fi
 
-for dir in ${dirs[@]}
-do 
    # check if directory is mounted (check if empty) 
+   printprocesslog "INFO check "$dir" with limit "$dutext"."
    if [ "$(ls -A $dir)" ]
    then 
@@ -65,5 +75,8 @@
    else
       echo "ERROR "$dir" seems to be not mounted."
+      printprocesslog "ERROR "$dir" seems to be not mounted."
    fi
 done
 
+finish
+