Changeset 9100 for trunk/MagicSoft/Mars

Timestamp:

08/05/08 17:33:16 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/condorstatistics (modified) (2 diffs)
• datacenter/scripts/dbchk (modified) (3 diffs)
• resources/steps.rc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -59 +59 @@
      - fixed bug in query of setstatus 
      - improved if-clause to avoid unneccessary output
+
+   * datacenter/db/menu.php:
+     - changed width input fields for ranges from 6 to 8
+
+   * datacenter/scripts/condorstatistic:
+     - fixed logging output
+
+   * datacenter/scripts/dbchk:
+     - added checking of consistency with table SequenceProcessStatus
+
+   * resources/steps.rc:
+     - fixed primaries of DataSetProcessStatus
 
 

trunk/MagicSoft/Mars/datacenter/scripts/condorstatistics

@@ -64 +64 @@
    case $check0 in 
       1)   echo " check0=$check0 -> everything ok -> move files" >> $scriptlog 2>&1
-           printprocesslog "INFO plots successfully produced"
+           printprocesslog "INFO condor statistic filled succesfully"
            day=`basename $date`
            cd `dirname $date`
@@ -79 +79 @@
            cd $mars
            ;;
-      *)   echo " check0=$check0 -> ERROR -> couldn't create plots -> exit" >> $scriptlog 2>&1
-           printprocesslog "ERROR producing plots failed"
+      *)   echo " check0=$check0 -> ERROR -> couldn't fill condor statistic to DB -> exit" >> $scriptlog 2>&1
+           printprocesslog "ERROR filling condor statistic to DB failed"
            finish >> $scriptlog 2>&1
            ;;

trunk/MagicSoft/Mars/datacenter/scripts/dbchk

@@ -163 +163 @@
 
 # CHECK 3
-echo "Checking if all sequences from Sequences exists RunData" >> $scriptlog 2>&1
+echo "Checking if all sequences from Sequences exist RunData" >> $scriptlog 2>&1
 sequences=`echo SELECT fSequenceFirst FROM Sequences GROUP BY fSequenceFirst | mymysql`
 for sequence in $sequences
@@ -177 +177 @@
 
 # CHECK 4
-echo "Checking if all sequences from RunData exists in Sequences" >> $scriptlog 2>&1
+echo "Checking if all sequences from RunData exist in Sequences" >> $scriptlog 2>&1
 sequences=`echo SELECT fSequenceFirst FROM RunData WHERE not fSequenceFirst=0 GROUP BY fSequenceFirst | mymysql`
 for sequence in $sequences
@@ -190 +190 @@
 done
 
+# CHECK 5
+echo "Checking if all sequences from RunData exist in SequenceProcessStatus" >> $scriptlog 2>&1
+sequences=`echo SELECT fSequenceFirst FROM RunData WHERE not fSequenceFirst=0 GROUP BY fSequenceFirst | mymysql`
+for sequence in $sequences
+do
+   var=`echo SELECT fSequenceFirst FROM SequenceProcessStatus WHERE fSequenceFirst=$sequence | mymysql`
+   if ! [ "$sequence" = "$var" ]
+   then
+      echo "Sequence $sequence exists in RunData but not in SequenceProcessStatus." >> $scriptlog 2>&1
+      printprocesslog "Sequence $sequence exists in RunData but not in SequenceProcessStatus (DB)." 
+      continue
+   fi
+done
+
 finish >> $scriptlog 2>&1

trunk/MagicSoft/Mars/resources/steps.rc

@@ -3 +3 @@
 RunProcessStatus.Primary: fRunNumber fTelescopeNumber fFileNumber
 SequenceProcessStatus.Primary: fSequenceFirst fTelescopeNumber
-DataSetProcessStatus.Primary: fDataSetNumber fTelescopeNumber
+DataSetProcessStatus.Primary: fDataSetNumber
 
 #--------------------------------------------------------------------