X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fscripts%2Fcrontab.sh;h=ee7c181dbd1e0be73f11f4bbad039b6fdedc7bec;hb=97c2d258a5c524eb5c4b85208899d80751a2c82f;hp=416a7139307621d2fa8dfb2a761856c1e0ddadc5;hpb=0c7a143b0a9b3393488580aef8bfb22a6992b2bc;p=helm.git

diff --git a/helm/matita/scripts/crontab.sh b/helm/matita/scripts/crontab.sh
index 416a71393..ee7c181db 100644
--- a/helm/matita/scripts/crontab.sh
+++ b/helm/matita/scripts/crontab.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
-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
+TODAY=`date +%Y%m%d`
+YESTERDAY=`date -d yesterday +%Y%m%d`
+TMPDIRNAME=.__${TODAY}_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
@@ -16,14 +14,22 @@ 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 -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;"`
+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 1`
+
+if [ -z "$MARK" ]; then
+  echo "No benchmark records for $TODAY"
+  exit 1
+fi
 
-if [ -z "$CUR_TIME" -o -z "$OLD_TIME" ]; then
-  echo "No benchamks records for $MARK"
+if [ -z "$LASTMARK" ]; then
+  echo "No benchmark records for $YESTERDAY"
   exit 1
 fi
 
+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;"`
+
 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`