Changeset 7469 for trunk/MagicSoft/Mars

Timestamp:

01/31/06 17:42:30 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/datacenter

Files:

• macros/setstatus.C (modified) (2 diffs)
• scripts/runcallisto (modified) (4 diffs)
• scripts/runganymed (modified) (3 diffs)
• scripts/runstar (modified) (3 diffs)

trunk/MagicSoft/Mars/datacenter/macros/setstatus.C

@@ -116 +116 @@
 }
 
-Int_t SetInfluences(MSQLServer &serv, TEnv &rc, TString primary, TString table, TString column, TString statustime, TString failed, TString starttime, TString failedtime, Bool_t resetall)
+Int_t SetInfluences(MSQLServer &serv, TEnv &rc, TString primary, TString table, TString column, TString statustime, TString failedcode, TString failedcomment, TString starttime, TString failedtime, Bool_t resetall)
 {
     cout << "set influenes for " << table << "." << column << endl;
@@ -123 +123 @@
     TString influences  = rc.GetValue(table+"."+column+".Influences", "");
 
-    TString query(Form("UPDATE %s SET %s=%s, fFailed=%s, fFailedTime=%s ",
-                       table.Data(), column.Data(), statustime.Data(), failed.Data(),
-                       failedtime.Data()));
+    TString query(Form("UPDATE %s SET %s=%s, fFailedCode=%s, fFailedComment='%s', fFailedTime=%s ",
+                       table.Data(), column.Data(), statustime.Data(), failedcode.Data(),
+                       failedcomment.Data(), failedtime.Data()));
     if (starttime.CompareTo("noreset"))
         query += Form(", fStartTime=%s", starttime.Data());

trunk/MagicSoft/Mars/datacenter/scripts/runcallisto

@@ -44 +44 @@
 
 # define callisto.rc files
-callistorcnew=$setuppath/$program/$program.rc
-callistorcmarapr05=$setuppath/$program/$program_MarApr05.rc
+callistorcnew=$setuppath/$program/callisto.rc
+callistorcmarapr05=$setuppath/$program/callisto_MarApr05.rc
 
 table=SequenceProcessStatus
@@ -147 +147 @@
   no=`printf %08d $sequence | cut -c 0-4`
   no2=`printf %08d $sequence`
+  var1=$no
+  var2=$no2
   outpath="$datapath/$program/$no/$no2"
   echo "outpath: "$outpath >> $scriptlog 2>&1
@@ -155 +157 @@
   
   # find callisto.rc file
-  if [ -e $outpath/$program.rc ]
+  if [ -e $outpath/callisto.rc ]
   then
      echo "found $program.rc in $outpath -> using this " >> $scriptlog 2>&1
-     callistorcseq=$outpath/$program.rc
+     callistorcseq=$outpath/callisto.rc
   else
      echo "no $program.rc found in $outpath -> making link " >> $scriptlog 2>&1
      if [ 49735 -lt $sequence ] && [ $sequence -lt 53516 ]
      then 
-        ln -vs $callistorcmarapr05 $outpath/$program.rc >> $scriptlog 2>&1
+        ln -vs $callistorcmarapr05 $outpath/callisto.rc >> $scriptlog 2>&1
      else
-        ln -vs $callistorcnew $outpath/$program.rc >> $scriptlog 2>&1
+        ln -vs $callistorcnew $outpath/callisto.rc >> $scriptlog 2>&1
      fi
-     callistorcseq=$outpath/$program.rc
+     callistorcseq=$outpath/callisto.rc
   fi
 
   echo "run $program..." >> $scriptlog 2>&1
-  setstatus "start"
+  setstatus "start" >> $scriptlog 2>&1
 
   ./callisto -b -q -v4 -f -raw --log=$outpath/$program$no2.log --html=$outpath/$program$no2.html --out=$outpath --config=$callistorcseq $sequfile  2>> $scriptlog > /dev/null
@@ -265 +267 @@
   # set status 
   echo "inserting the status for $program for sequence $sequence into the db" >> $scriptlog 2>&1
-  setstatus "stop"
+  setstatus "stop"  >> $scriptlog 2>&1
 done
 

trunk/MagicSoft/Mars/datacenter/scripts/runganymed

@@ -142 +142 @@
   no=`printf %08d $dataset | cut -c 0-5`
   no2=`printf %08d $dataset`
+  var1=$no
+  var2=$no2
   outpath="$datapath/$program/$no/$no2"
   echo "outpath: "$outpath >> $scriptlog 2>&1
@@ -160 +162 @@
   
   echo "run $program..." >> $scriptlog 2>&1
-  setstatus "start"
+  setstatus "start" >> $scriptlog 2>&1
 
   ./ganymed -b -q -v4 -f --ind=$datapath/star --config=$ganymedrc --log=$outpath/$program$no2.log --html=$outpath/$program$no2.html --out=$outpath $datasetfile  2>> $scriptlog> /dev/null
@@ -173 +175 @@
   esac
   echo "inserting the status for $program for dataset $dataset into the db" >> $scriptlog 2>&1
-  setstatus "stop"
+  setstatus "stop" >> $scriptlog 2>&1
 done
 

trunk/MagicSoft/Mars/datacenter/scripts/runstar

@@ -142 +142 @@
   no=`printf %08d $sequence | cut -c 0-4`
   no2=`printf %08d $sequence`
+  var1=$no
+  var2=$no2
   outpath="$datapath/$program/$no/$no2"
   inpath=`echo $outpath | sed -e 's/$program/callisto/'`
@@ -152 +154 @@
   
   echo "run $program..." >> $scriptlog 2>&1
-  setstatus "start"
+  setstatus "start" >> $scriptlog 2>&1
 
   ./star -b -q -v4 -f --log=$outpath/$program$no2.log --html=$outpath/$program$no2.html --ind=$inpath --out=$outpath $sequfile  2>> $scriptlog> /dev/null
@@ -165 +167 @@
   esac
   echo "inserting the status for $program for sequence $sequence into the db" >> $scriptlog 2>&1
-  setstatus "stop"
+  setstatus "stop" >> $scriptlog 2>&1
 done