Changeset 7474

Timestamp:

02/03/06 10:35:02 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/runcallisto (modified) (3 diffs)
• datacenter/scripts/sourcefile (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/02/03 Daniela Dorner, Daniel Hoehne
+
+   * datacenter/scripts/sourcefile: 
+     - fixed small bugs
+
+   * datacenter/scripts/runcallisto: 
+     - small bugfix
+     - improved logging
+
+
+
  2006/02/02 Daniela Dorner
 

trunk/MagicSoft/Mars/datacenter/scripts/runcallisto

@@ -217 +217 @@
              if [ "$cacofile" = "" ]
              then 
-                echo "no cacofile found for run "$runno >> $scriptlog 2>&1
+                echo "cacofile with no $runno not found" >> $scriptlog 2>&1
                 echo "finding cacofile..." >> $scriptlog 2>&1
                 for (( i = 0; i <= 10; i++ ))
@@ -229 +229 @@
                    if [ "$cacofile" = "" ]
                    then
+                      if [ $i -eq 9 ]
+                      then
+                         echo "no cacofile found" >> $scriptlog 2>&1
+                         com="no cacofile for run $runno"
+                         check=0
+                      fi   
                       continue
                    else
@@ -235 +241 @@
                    fi
                 done
-                echo "no cacofile found" >> $scriptlog 2>&1
-                com="no cacofile for run $runno"
-                check=0
-                break
              fi
              ./merpp -u --log=$merpplogpath/merppccupdate$runno.log --html=$merpplogpath/merppccupdate$runno.html --auto-time-stop --runfile=$runno $ccfile $calfile 2>> $scriptlog> /dev/null

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -47 +47 @@
 datasetpath=/magic/datasets
 
+check="ok"
+
 
 function makedir()
@@ -92 +94 @@
        stop)   echo "stop"
                case $check in
-                  0)  echo " ok"
+                 ok)  echo " ok"
                       statustime="Now()"
                       ;;
@@ -107 +109 @@
                ;;
    esac
-   check=
 
 #   printstatusvalues
@@ -116 +117 @@
    checkstatus=`root -q -b $macrospath/setstatus.C+\("\"$sequence\""\,"\"$table\""\,"\"$column\""\,"\"$statustime\""\,"\"$failedcode\""\,"\"$failedcomment\""\,"\"$starttime\""\,"\"$failedtime\""\) | tee $setstatuslog | grep int | sed -e 's/(int)//'`
    case $checkstatus in
-      1)   echo "checkstatus=$checkstatus -> everything ok, status has been set"
-      *)   echo "checkstatus=$checkstatus -> ERROR -> step could not be set"
+      1)   echo "checkstatus=$checkstatus -> everything ok, status has been set";;
+      *)   echo "checkstatus=$checkstatus -> ERROR -> step could not be set";;
    esac
 }