Changeset 7476 for trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck

Timestamp:

02/03/06 16:42:00 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck (modified) (6 diffs)

trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck

@@ -50 +50 @@
 table=RunProcessStatus
 column=fDataCheckDone
-date=NULL
-datetime=`date +%F-%H-%M-%S`
-year=`date +%Y`
 
 todofile=$listpath/ToDo-$table-$column
-getstatuslogpath=$logpath/getstatus/$program/$year
-getstatuslog=$getstatuslogpath/getstatus-$program-$datetime.log
 
 scriptlogpath=$logpath/run/$program/`date +%Y/%m`
@@ -63 +58 @@
 
 date >> $scriptlog 2>&1
-
-makedir $getstatuslogpath >> $scriptlog 2>&1
 
 # check if there are already todo files
@@ -84 +77 @@
    esac
 
-   echo "getting list..." >> $scriptlog 2>&1
-   check0=`root -q -b $macrospath/getdolist.C+\("\"$table\""\,"\"$column\""\,"\"$date\""\,"\"$listpath\""\) | tee $getstatuslog | grep int | sed -e 's/(int)//'`
-
-   case $check0 in
-      1)   echo "check0=$check0 -> everything ok -> do $program" >> $scriptlog 2>&1;;
-      *)   echo "check0=$check0 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1;;
-   esac
+   # get todo list
+   getdolist  >> $scriptlog 2>&1
+
    rm -v $lockpath/lock-getting-$program-list.txt >> $scriptlog 2>&1
 fi
@@ -133 +122 @@
 then 
    echo "nothing to do -> exit"  >> $scriptlog 2>&1
-   rm -v $todofile >> $scriptlog 2>&1
-   rm -v $lockfile >> $scriptlog 2>&1
-   date  >> $scriptlog 2>&1
-   exit
+   finish >> $scriptlog 2>&1
 fi
 
@@ -227 +213 @@
    makedir $resetlogpath >> $scriptlog 2>&1
    resetlog=$resetlogpath/reset-exclusions-$no2-$date2.log
-   echo "setstatuslogfile: $setstatuslog" >> $scriptlog 2>&1
-
-   check5=`root -q -b $macrospath/resetcolumn.C+\("\"fExclusionsDone\""\,"\"SequenceBuildStatus\""\,"\"$date2\""\,"\"$date2\""\,kFALSE\) | tee $setstatuslog | grep int | sed -e 's/(int)//'`
+
+   check5=`root -q -b $macrospath/resetcolumn.C+\("\"fExclusionsDone\""\,"\"SequenceBuildStatus\""\,"\"$date2\""\,"\"$date2\""\,kFALSE\) | tee $resetlog | grep int | sed -e 's/(int)//'`
    case $check5 in
       1)   echo "check5=$check5 -> everything ok, fExclusions have been reset " >> $scriptlog 2>&1
@@ -248 +233 @@
    var1=$date
    var2=$no2
-   setstatus
+   setstatus "stop" >> $scriptlog 2>&1
 done
 
-rm -v $todofile >> $scriptlog 2>&1 
-rm -v $lockfile >> $scriptlog 2>&1 
-
-set +C
-
-date  >> $scriptlog 2>&1
-
+finish >> $scriptlog 2>&1
+