no more multiple configure/Makefile, just one for both ocaml/ and matita/

[helm.git] / helm / matita / scripts / public_html / common.php

diff --git a/helm/matita/scripts/public_html/common.php b/helm/matita/scripts/public_html/common.php
index 81a0565cf9faad81de5f47dc0258cf83db688cd0..f2a9be030ea5e26c36788fa13b2bbbd8c9945baa 100644 (file)
--- a/helm/matita/scripts/public_html/common.php
+++ b/helm/matita/scripts/public_html/common.php
@@ -5,7 +5,7 @@ function query($q) {
   mysql_select_db("matita");
   if (preg_match("/TIME_TO_SEC/",$q)) {
     $group_by = true;
-    $q = preg_replace("/group by mark/","",$q);
+    $q = preg_replace("/group by bench.mark/","",$q);
     $q = preg_replace("/SEC_TO_TIME\(SUM\(TIME_TO_SEC\(([^)]+)\)\)\)/","$1",$q);
   }
   $rc = mysql_query($q,$db);
@@ -25,10 +25,21 @@ function query($q) {
   }
 }
 
+function time_2_cents($t) {
+  $matches = array();
+  $rex = "/^(\d+)m(\d\d?)\.(\d{2})s$/";
+  $m = preg_match($rex,$t,$matches);
+  if ( $m == 0 ) exit(1);
+  $t_minutes = $matches[1];
+  $t_secs = $matches[2];
+  $t_cents = $matches[3];
+  return ((int) $t_cents) + ((int) $t_secs) * 100 + ((int)$t_minutes) * 6000 ;
+}
+
 function sum_time($t1, $t2) {
   $matches1 = array();
   $matches2 = array();
-  $rex = "/^(\d+)m(\d{2})\.(\d{2})s$/";
+  $rex = "/^(\d+)m(\d\d?)\.(\d{2})s$/";
   $m1 = preg_match($rex,$t1,$matches1);
   $m2 = preg_match($rex,$t2,$matches2);
   if ($m1 != 0 && $m2 != 0) {