From: Claudio Sacerdoti Coen Date: Fri, 28 Oct 2005 22:18:04 +0000 (+0000) Subject: Ported to multiple marks in the same day: today newest mark is compared X-Git-Tag: V_0_7_2_3~166 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=0c7a143b0a9b3393488580aef8bfb22a6992b2bc;p=helm.git Ported to multiple marks in the same day: today newest mark is compared with yesterday newest mark. --- diff --git a/helm/matita/scripts/crontab.sh b/helm/matita/scripts/crontab.sh index f1f28356c..416a71393 100644 --- a/helm/matita/scripts/crontab.sh +++ b/helm/matita/scripts/crontab.sh @@ -1,8 +1,13 @@ #!/bin/bash -MARK=`date +%Y%m%d` -LASTMARK=`date -d yesterday +%Y%m%d` +TODAY=`date +%Y%m%d0200` +YESTERDAY=`date -d yesterday +%Y%m%d0200` +MARK=`echo "select distinct mark from bench where mark like '$TODAY%' order by mark" | mysql -u helm matita | tail -n 1` +LASTMARK=`echo "select distinct mark from bench where mark like '$YESTERDAY%' order by mark" | mysql -u helm matita | tail -n 2 | head -n 1` TMPDIRNAME=.__${MARK}_crontab CVSROOT=":ext:$USER@marcello.cs.unibo.it:/home/faculty/PROJECTS/cvs/helm" +SHELLTIME2CENTSPHP=helm/matita/scripts/shell_time2cents.php +SHELLADDERPHP=helm/matita/scripts/shell_adder.php +COMMONPHP=helm/matita/scripts/public_html/common.php OLD=$PWD rm -rf $TMPDIRNAME @@ -11,42 +16,45 @@ cd $TMPDIRNAME cvs -d $CVSROOT co helm/matita/scripts 1>/dev/null 2>/dev/null helm/matita/scripts/profile_cvs.sh 2> LOG -CUR_TIME=`/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_adder.php -- public_html/common.php "select SEC_TO_TIME(SUM(TIME_TO_SEC(time))) from bench where mark = \"$MARK\" group by mark;"` -OLD_TIME=`/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_adder.php -- public_html/common.php "select SEC_TO_TIME(SUM(TIME_TO_SEC(time))) from bench where mark = \"$LASTMARK\" group by mark;"` +CUR_TIME=`/usr/bin/php4 -c /etc/php4/apache/php.ini -f $SHELLADDERPHP -- $COMMONPHP "select SEC_TO_TIME(SUM(TIME_TO_SEC(time))) from bench where mark = \"$MARK\" group by mark;"` +OLD_TIME=`/usr/bin/php4 -c /etc/php4/apache/php.ini -f $SHELLADDERPHP -- $COMMONPHP "select SEC_TO_TIME(SUM(TIME_TO_SEC(time))) from bench where mark = \"$LASTMARK\" group by mark;"` if [ -z "$CUR_TIME" -o -z "$OLD_TIME" ]; then echo "No benchamks records for $MARK" exit 1 fi -((DELTA=`/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_time2cents.php -- public_html/common.php $CUR_TIME` - `/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_time2cents.php -- public_html/common.php $OLD_TIME`)) +CUR_CENTS=`/usr/bin/php4 -c /etc/php4/apache/php.ini -f $SHELLTIME2CENTSPHP -- $COMMONPHP $CUR_TIME` +OLD_CENTS=`/usr/bin/php4 -c /etc/php4/apache/php.ini -f $SHELLTIME2CENTSPHP -- $COMMONPHP $OLD_TIME` + +((DELTA=$CUR_CENTS-$OLD_CENTS)) if [ $DELTA -lt 0 ]; then PERC=0 else ((PERC=100 * $DELTA)) - ((PERC=$PERC / `/usr/bin/php4 -c /etc/php4/apache/php.ini - shell_time2cents.php -- public_html/common.php $OLD_TIME`)) + ((PERC=$PERC / $OLD_CENTS)) fi if [ $PERC -ge 5 ]; then cat <