Changeset 14192 for trunk

Timestamp:

06/19/12 18:25:45 (12 years ago)

Author:

Daniela Dorner

Message:

bugfix for case file size is the same but file is in fails directory (stayed unnoticed as size in archive was different so far)

File:

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

trunk/DataCheck/Transfer/CheckTransfer.sh

@@ -66 +66 @@
    zip=( `ssh fact@161.72.93.131 "if [ -d $lpziprawpath ]; then ls $lpziprawpath/* | wc -l; du -s -b --apparent-size $lpziprawpath; else echo '-1 -1 -1'; fi"` )
    dl00=( `if [ -d $localrawpath ]; then ls $localrawpath/* | wc -l; du -s -b --apparent-size $localrawpath; else echo '-1 -1 -1'; fi` )
-   archive=( `if [ -d $localrawpath3 ]; then ls $localrawpath3/* | wc -l; du -s -b --apparent-size $localrawpath3; else echo '-1 -1 -1'; fi` )
-   fails=( `if [ -d $localfailpath ]; then ls $localfailpath/* | wc -l; du -s -b --apparent-size $localfailpath; else echo '-1 -1 -1'; fi` )
+   archive=( `if [ -d $localrawpath3 ]; then ls $localrawpath3/* | wc -l; du -L -s -b --apparent-size $localrawpath3; else echo '-1 -1 -1'; fi` )
+   fails=( `if [ -d $localfailpath ]; then ls $localfailpath/* | wc -l; du -L -s -b --apparent-size $localfailpath; else echo '-1 -1 -1'; fi` )
    wue=( `ssh operator@coma.astro.uni-wuerzburg.de "if [ -d $wuerawpath ]; then ls $wuerawpath/* | wc -l; du -s -b --apparent-size $wuerawpath; else echo '-1 -1 -1'; fi"` )
    query="SELECT Sum(if(fHasDrsFile=1,2,1)) FROM RunInfo WHERE fNight="$date2
@@ -320 +320 @@
          if ! [ ${archive[1]} -eq -1 ]
          then
-            sizearchive=( `ls -l $localrawpath3/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
+            sizearchive=( `ls -lH $localrawpath3/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
          fi
          if ! [ ${fails[1]} -eq -1 ]
          then
-            sizefails=( `ls -l $localfailpath/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
+            sizefails=( `ls -lH $localfailpath/$rawfile2 2>/dev/null | awk '{ print \$5 }'` )
          fi
          if ! [ ${wue[1]} -eq -1 ]
@@ -349 +349 @@
          fi
          # archive
-         if [  "$sizezip" != "$sizearchive"  -a  ${archive[1]} -ne -1 ] || [  "$sizezip" != "$sizefails" -a ${fails[1]} -ne -1  ]
+         if [  "$sizezip" != "$sizearchive"  -a  ${archive[1]} -ne -1 -a "$sizearchive" != "" ] || [  "$sizezip" != "$sizefails" -a ${fails[1]} -ne -1 -a "$sizefails" != "" ]
          then
             echo "  "$rawfile2" data("$sizezip") archive("$sizearchive"/"$sizefails")"
+            echo " "$sizezip"-"$sizearchive"-"${archive[1]}"-"$sizezip"-"$sizefails"-"${fails[1]}
             archivediffcounter=`echo " $archivediffcounter + 1 " | bc -l `
          else
@@ -483 +484 @@
    echo " ldaw-ldaw-ldaw-ldaw"
    echo " "$result
-   sumdatanew=`echo " ( ${data[1]} + ${zip[1]} ) / 1024 / 1024 / 1024 " | bc -l `
-   sumdata=`echo " $sumdata + $sumdatanew " | bc -l `
-   echo "checked alread "$sumdata" GB."$sumdatanew" "${data[1]}" "${zip[1]}
+   sumdatanew=`echo " ( ${data[1]} + ${zip[1]} ) / 1024 / 1024 / 1024 " | bc -l | cut -d. -f1`
+   sumdata=`echo " $sumdata + $sumdatanew " | bc -l | cut -d. -f1`
+   echo "checked alread "$sumdata" GB. "$sumdatanew" "${data[1]}" "${zip[1]}
    if [ $numpb -lt 4 ]
    then