Changeset 19469 for trunk/DataCheck

Timestamp:

03/29/19 14:33:41 (5 years ago)

Author:

Daniela Dorner

Message:

fixed bug

File:

• trunk/DataCheck/Monitoring/CheckSwiftSchedule.sh (modified) (4 diffs)

trunk/DataCheck/Monitoring/CheckSwiftSchedule.sh

@@ -68 +68 @@
    #lynx -width 200 -nolist -dump https://www.swift.psu.edu/operations/obsSchedule.php?d=$nextday | grep $nextday >> $schedulefile
    links -width 300 -ssl.certificates 0 -dump https://www.swift.psu.edu/operations/obsSchedule.php?d=$nextday | grep $nextday >> $schedulefile
+   # fixme: find out why sometimes second day is missing in file (probably just put online late) 
 
    # check if schedule is empty
@@ -79 +80 @@
    # grep only the columns which are needed
    #cat $schedulefile | sed -r -e 's/[0-9]{5,6}[\ ]{1,4}[0-9]{1,3}[\ ]{1,6}//' | grep -o -E '^[\ ]{1,20}20[1-9][0-9]-[01][0-9]-[0-3][0-9]\ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\ \ \ 20[1-9][0-9]-[01][0-9]-[0-3][0-9]\ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\ \ \ [A-Z1-4]([A-Za-z0-9][\ \.\+\-]?){3,20}' > $schedulefile2
-   cat $schedulefile | awk '{ print $1" "$2" "$3" "$4" "$7" "$8" "$9}' | sed -r -e 's/[-]?[0-9]{1,3}[.][0-9]{5}$//' | sed -r -e 's/[-]?[0-9]{1,3}[.][0-9]{5}\ $//' > $schedulefile2
+   cat $schedulefile | awk -v d1=$date2 -v d2=$nextday '{ if (($1 ~ d1 && $2 ~ /^18|^19|^20|^21|^22|^23/) || ( $1 ~ d2 && $2 ~ /^0/)) print $1" "$2" "$3" "$4" "$7" "$8" "$9}' | sed -r -e 's/[-]?[0-9]{1,3}[.][0-9]{5}$//' | sed -r -e 's/[-]?[0-9]{1,3}[.][0-9]{5}\ $//' > $schedulefile2
    
    # output list of sources
@@ -99 +100 @@
    for (( i=0; i<${#sources[@]}; i++ ))
    do
-      sourceline=`grep "${sources[$i]}" $schedulefile2`
-      if [ "$sourceline" = "" ]
-      then
-         continue
-      fi
-      dat=`echo $sourceline | awk '{ print $1 }' | sed -e 's/-/\//g'`
-      #echo $dat
-      hour=`echo $sourceline | awk '{ print $2 }' | awk -F':' '{ print $1 }'`
-      if [ $hour -gt 12 ] && [ "$dat" != "$date" ]
-      then
-         continue
-      fi
-      if [ $hour -lt 12 ] && [ "$dat" == "$date" ]
-      then
-         continue
-      fi
-      #echo "--"$hour"--"
-      echo $sourceline >>$schedulefile3
+      grep "${sources[$i]}" $schedulefile2  >>$schedulefile3
    done
    
@@ -125 +109 @@
       echo -e "\nNone of the sources was found in the Swift schedule." >> $schedulefile3
    else
-      echo -n $date": " && cat $schedulefile3 | grep -v Searched 
+      echo "night of "$date": " && cat $schedulefile3 | grep -v Searched | sort
    fi