Changeset 18323 for trunk

Timestamp:

08/31/15 01:42:26 (9 years ago)

Author:

Daniela Dorner

Message:

added check of certaindate-variable to getdate()

File:

• trunk/DataCheck/Sourcefile.sh (modified) (3 diffs)

trunk/DataCheck/Sourcefile.sh

@@ -481 +481 @@
          ;;
       # certain date
-      [0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9])
-         printprocesslog "DEBUG getdates case certain date: "$1
-         dates=( $1 )
+      [0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]|[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]-[0-9][0-9][0-9])
+         d=`echo $1 | grep -o [0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]`
+         range=`echo $1 | grep -o '[0-9][0-9][0-9]$'`
+         range=`echo $range | sed -e 's/^0//' -e 's/^0//'`
+         printprocesslog "DEBUG getdates - certain date "$d"."
+         dates=( $d )
+         if [ "$range" != "" ]
+         then 
+            printprocesslog "DEBUG getdates - add the last "$range" days."
+            yy=`echo $d | cut -c 1-4`
+            mm=`echo $d | cut -c 6-7`
+            dd=`echo $d | cut -c 9-10`
+            for (( numdates=1 ; numdates <= $range ; numdates++ ))
+            do 
+               numhours=`echo " 12 + ( $numdates - 1 ) * 24 " | bc -l`
+               dates=( ${dates[@]} `date +%Y/%m/%d --date=$yy/$mm/$dd"-"$numhours"hour"` )
+            done
+         fi
          ;;
-      # certain number of dates (between 0 and 99 )
-      [0-9][0-9]|[0-9]|[0-9][0-9][0-9])
+      # certain number of dates (between 0 and 9999)
+      [1-9][0-9][0-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9]|[1-9])
          # get last n nights
+         printprocesslog "DEBUG getdates - get the last "$1" days."
          for (( numdates=1 ; numdates <= $1 ; numdates++ ))
          do 
@@ -500 +516 @@
             if [ $hour -le $2 ] || [ $hour -ge $3 ]
             then
+               printprocesslog "DEBUG getdates - get the current night."
                dates=( `date +%Y/%m/%d --date="-12hour"` )
             fi
@@ -505 +522 @@
          ;;
       *) # nothing valid given
-         echo "Please give valid options for the function 'getdates()'"
+         echo "Please give valid option (YYYY/MM/DD[-RRR] or 1-9999)"
          finish
          ;;