fix

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

diff --git a/helm/software/matita/scripts/public_html/common.php b/helm/software/matita/scripts/public_html/common.php
index f2a9be030ea5e26c36788fa13b2bbbd8c9945baa..5b9f51e5dc68cc488bb66d2b4ee79528a2ebf3bc 100644 (file)
--- a/helm/software/matita/scripts/public_html/common.php
+++ b/helm/software/matita/scripts/public_html/common.php
@@ -1,28 +1,17 @@
 <?php
 
-function query($q) {
+function query($q,$f) {
   $db = mysql_pconnect("localhost","helm");
   mysql_select_db("matita");
-  if (preg_match("/TIME_TO_SEC/",$q)) {
-    $group_by = true;
-    $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);
   if(!$rc) {
     die("Query failed: " . mysql_error());
   }
-  $result = array();
   while( $row = mysql_fetch_array($rc, MYSQL_ASSOC)){
-    $result[] = $row;
+    $f($row);
   }
   mysql_free_result($rc);
   mysql_close($db);
-  if ($group_by){
-    return group_array_by_mark($result);
-  } else {
-    return $result;
-  }
 }
 
 function time_2_cents($t) {
@@ -36,45 +25,6 @@ function time_2_cents($t) {
   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\d?)\.(\d{2})s$/";
-  $m1 = preg_match($rex,$t1,$matches1);
-  $m2 = preg_match($rex,$t2,$matches2);
-  if ($m1 != 0 && $m2 != 0) {
-    $t1_minutes = $matches1[1];
-    $t2_minutes = $matches2[1];
-    $t1_secs = $matches1[2];
-    $t2_secs = $matches2[2];
-    $t1_cents = $matches1[3];
-    $t2_cents = $matches2[3];
-    $time1 = ((int) $t1_cents) + ((int) $t1_secs) * 100 + ((int)$t1_minutes) * 6000 ;
-    $time2 = ((int) $t2_cents) + ((int) $t2_secs) * 100 + ((int)$t2_minutes) * 6000 ;
-    $sum = $time1 + $time2;
-    $min = $sum / 6000;
-    $sec = ($sum % 6000) / 100;
-    $cent = ($sum % 6000) % 100;
-    return sprintf("%dm%02d.%02ds",$min,$sec,$cent);
-  } else {
-    return $t1;
-  }
-}
-
-function group_array_by_mark($a) {
-  $rc = array();
-  foreach ($a as $x) {
-    if ($rc[$x['mark']] == NULL) {
-      $rc[$x['mark']] = $x;
-    } else {
-      foreach ($rc[$x['mark']] as $k => $v) {
-        $rc[$x['mark']][$k] = sum_time($v, $x[$k]);
-      }
-    }
-  }
-  return array_values($rc);
-}
-  
 function array_to_combo($l,$a) {
   echo "<select name=\"$l\">";
   echo "<option value=\"--\">--</option>";