Index: /trunk/DataCheck/CheckRawData.sh
===================================================================
--- /trunk/DataCheck/CheckRawData.sh	(revision 12932)
+++ /trunk/DataCheck/CheckRawData.sh	(revision 12933)
@@ -6,9 +6,9 @@
 # options: 
 skipmd5sum="no" # fill md5 sums in any case
-skipmd5sum="iffilled" # fill md5 sum only if they are not yet in db
+skipmd5sum="iffilled" # fill md5 sum only if they are not yet in db # default
 #skipmd5sum="yes" # do not fill md5 sums in any case
 
 doupdate="yes" # update all entries
-doupdate="no" # fill only entries which are not yet existing
+#doupdate="no" # fill only entries which are not yet existing #default
 
 source `dirname $0`/Sourcefile.sh
@@ -37,4 +37,5 @@
 dates=( `date +%Y/%m/%d --date="-12hour"` `date +%Y/%m/%d --date="-36hour"` )
 #dates=( `find /loc_data/zipraw/ -mindepth 3 -type d | sort | sed -e 's/\/loc_data\/zipraw\///g'` ) #all available dates in /loc_data/zipraw
+#dates=( "2012/02/19" )
 
 # do check for rawfiles of these dates
@@ -62,4 +63,5 @@
    do
       printprocesslog "INFO checking file "$file
+      #echo "INFO checking file "$file
 
       # raw and original file
@@ -115,5 +117,5 @@
       
       # check if entry already exists
-      query3="SELECT fRunNumber FROM RunInfo WHERE Concat(fRunNumber, '_', LPAD(fFileNumber, 3, 0))='"$numberfromname"'"
+      query3="SELECT fNight FROM RunInfo WHERE Concat(fNight, '_', LPAD(fRunID, 3, 0))='"$numberfromname"'"
       printprocesslog "DEBUG check if entry already exists in DB. QUERY: "$query3
       result3=`/usr/bin/mysql -u operator --host=fact01.fact.local --password=$password FactData -e "$query3"`
@@ -131,8 +133,11 @@
       # check if fits file is corrupted
       numfitserrors=0
-      checkfitsfile=`fverify $rawfile | grep '0 error(s)'`
-      if [ "$checkfitsfile" == "" ]
-      then
-         numfitserrors=1
+      #checkfitsfile=`fverify $rawfile 2>/dev/null | grep '0 error(s)'`
+      numfitserrors=`fverify $rawfile 2>/dev/null | grep -o '[0-9][ ]error(s)'  | grep -E -o '[0-9]'`
+      #if [ "$checkfitsfile" == "" ]
+      if [ $numfitserrors -gt 0 ]
+      then
+         printprocesslog "WARN "$rawfile" has "$numfitserrors" fitserror(s). "
+         #numfitserrors=1
       fi
 
@@ -158,4 +163,5 @@
          # in the very beginning only drs-files were existing
          # in the beginning the keywords DRSCALIB and STEP were not existing
+         numdrsfiles=
          step=
          drsfile=`echo $file | sed -e 's/fits/drs.fits/'`
@@ -168,4 +174,9 @@
             then 
                printprocesslog "ERROR for file "$file" number of drsfiles ("$numdrsfiles") and information from header ("$drscalib") don't agree."
+            fi
+         else
+            if ! [ "$drscalib" == "F" ]
+            then
+               printprocesslog "WARN for file "$file" DRSCALIB is neither T nor F."
             fi
          fi
@@ -185,4 +196,12 @@
          numped=`$factpath/fitsdump -h -t Events $file  2>/dev/null | grep 'NTRGPED' | grep -E -o '[0-9]+'`
          numtime=`$factpath/fitsdump -h -t Events $file  2>/dev/null | grep 'NTRGTIM' | grep -E -o '[0-9]+'`
+         compiled=`$factpath/fitsdump -h -t Events $file  2>/dev/null | grep 'COMPILED' | grep -E -o "['][a-zA-Z]+[ ][ 12][0-9][ ]20[0-9][0-9][ ][0-2][0-9]:[0-5][0-9]:[0-5][0-9][']" | sed -e "s/'//g"`
+         if ! [ "$compiled" == "" ]
+         then 
+            compiletime=`date +'%F %H:%M:%S' --date="${compiled}" `
+         else
+            compiletime=
+         fi
+         revnum=`$factpath/fitsdump -h -t Events $file  2>/dev/null | grep 'REVISION' | grep -E -o "['][0-9]+[:]?[0-9]*[MSP]*[']" | sed -e "s/'//g"`
          # in newest data start time is in DATE-OBS
          # in older data start time is in TSTART
@@ -255,5 +274,5 @@
 
       # check if entry has already checksums
-      query5="SELECT fRunNumber FROM RunInfo WHERE Concat(fRunNumber, '_', LPAD(fFileNumber, 3, 0))='"$numberfromname"'"
+      query5="SELECT fNight FROM RunInfo WHERE Concat(fNight, '_', LPAD(fRunID, 3, 0))='"$numberfromname"'"
       query5=$query5" AND NOT ISNULL(fMd5sumRaw) AND NOT ISNULL(fMd5sumRawZip)"
       printprocesslog "DEBUG check if md5sums are alreay in DB. QUERY:"$query5
@@ -287,10 +306,10 @@
       then 
          query4="INSERT"
-         querymid=" fRunNumber="$runnumber", fFileNumber="$filenumberfromname", "
+         querymid=" fNight="$runnumber", fRunID="$filenumberfromname", "
          querystop=
       else
          query4="UPDATE"
          querymid=
-         querystop=" WHERE fRunNumber="$runnumber" AND fFileNumber="$filenumberfromname
+         querystop=" WHERE fNight="$runnumber" AND fRunID="$filenumberfromname
       fi
       query4=$query4" RunInfo SET "$querymid" fRunTypeKey="${result2[1]}
@@ -300,5 +319,5 @@
          if [ "$numevents" != "" ]
          then
-            query4=$query4", fNumEvents="$numevent
+            query4=$query4", fNumEvents="$numevents
          fi
          if [ "$roi" != "" ]
@@ -346,4 +365,7 @@
       then
          query4=$query4", fMd5sumRaw='"$md5sum"', fMd5sumRawZip='"$md5sumzip"'"
+      fi
+      if [ "$numdrsfiles" != "" ]
+      then
          query4=$query4", fHasDrsFile="$numdrsfiles
       fi
@@ -351,4 +373,12 @@
       then
          query4=$query4", fDrsStep="$step
+      fi
+      if [ "$compiletime" != "" ]
+      then
+         query4=$query4", fCompileTime='"$compiletime"'"
+      fi
+      if [ "$revnum" != "" ]
+      then
+         query4=$query4", fRevisionNumber='"$revnum"'"
       fi
       query4=$query4", fFitsFileErrors="$numfitserrors