Changeset 18775

Timestamp:

02/21/17 21:21:56 (8 years ago)

Author:

Daniela Dorner

Message:

fixed bug and added check

File:

• trunk/DataCheck/Transfer/CheckTransfer.sh (modified) (5 diffs)

trunk/DataCheck/Transfer/CheckTransfer.sh

@@ -127 +127 @@
       fi
    fi
-
+   
    # some counters
    numdiff=0
@@ -613 +613 @@
          #rawfile2=$rawfile".gz"
          rawfile2=$rawfile".*z"
-         printprocesslog "INFO checking "$rawfile
+         printprocesslog "INFO checking "$rawfile2
          
          # get file sizes for run
          #sizenewdaq=( `ssh fact@161.72.93.131 "ls -l ${lprawpath}/${rawfile} 2>/dev/null | awk '{ print \\\$5 }'"` )
-         sizenewdaq=( `ssh fact@161.72.93.131 "ls -lH ${lprawpath}/${rawfile} 2>/dev/null | awk '{ print \\\$5 }'"` )
-         sizedaq=( `ssh fact@161.72.93.131 "ls -l $lprawpath2/$rawfile 2>/dev/null | awk '{ print \\\$5 }'"` )
+         sizenewdaq=( `ssh fact@161.72.93.131 "ls -lH ${lprawpath}/${rawfile2} 2>/dev/null | awk '{ print \\\$5 }'"` )
+         sizedaq=( `ssh fact@161.72.93.131 "ls -l $lprawpath2/$rawfile2 2>/dev/null | awk '{ print \\\$5 }'"` )
          sizezip=( `ssh fact@161.72.93.131 "ls -l $lpziprawpath/$rawfile2 2>/dev/null | awk '{ print \\\$5 }'"` )
          if ! [ ${dl00[1]} -eq -1 ]
@@ -635 +635 @@
          then
             sizewue=( `ssh operator@coma.astro.uni-wuerzburg.de "ls -l $wuerawpath/$rawfile2 2>/dev/null | awk '{ print \\\$5 }'"` )
+         fi
+         
+         if [ "$sizenewdaq" = "" ] ||  [ "$sizedaq" = "" ] ||  [ "$sizezip" = "" ] ||  [ "$sizedl00" = "" ] ||  [ "$sizewue" = "" ] || [  [ "$sizefails" = "" ] &&  [ "$sizearchive" = "" ] ]
+         then
+            printprocesslog "WARN one or more of the sizes empty: "$sizenewdaq"(newdaq) "$sizedaq"(daq) "$sizezip"(data) "$sizedl00"(dl) "$sizewue"(wue) "$sizefails"(fails) "$sizearchive"(arch) "
+            continue
          fi
          #if ! [ ${phido[1]} -eq -1 ]
@@ -645 +651 @@
          if ! [ "$sizenewdaq" = "$sizedaq" ]
          then
-            printprocesslog "WARN "$rawfile" newdaq("$sizenewdaq") daq("$sizedaq")"
-            echo "  "$rawfile" newdaq("$sizenewdaq") daq("$sizedaq")" >> $logfile 2>&1
+            printprocesslog "WARN "$rawfile2" newdaq("$sizenewdaq") daq("$sizedaq")"
+            echo "  "$rawfile2" newdaq("$sizenewdaq") daq("$sizedaq")" >> $logfile 2>&1
             daqdiffcounter=`echo " $daqdiffcounter + 1 " | bc -l `
          else
@@ -726 +732 @@
          #   sizephido=( `ssh -i /home_nfs/isdc/fact_opr/.ssh/id_rsa.fact_opr.phido 129.217.160.201 "ls -l $phidorawpath/$rawfile2 2>/dev/null | awk '{ print \\\$5 }'"` )
          #fi
+         if [ "$sizenewdaq" = "" ] ||  [ "$sizedaq" = "" ] ||  [ "$sizezip" = "" ] ||  [ "$sizedl00" = "" ] ||  [ "$sizewue" = "" ] || [  [ "$sizefails" = "" ] &&  [ "$sizearchive" = "" ] ]
+         then
+            printprocesslog "WARN one or more of the sizes empty: "$sizenewdaq"(newdaq) "$sizedaq"(daq) "$sizezip"(data) "$sizedl00"(dl) "$sizewue"(wue) "$sizefails"(fails) "$sizearchive"(arch) "
+            continue
+         fi
          
          # check file sizes for run