Changeset 35

Timestamp:

Nov 8, 2008, 10:13:48 PM (16 years ago)

Author:

george

Message:

• Upraveno: Malé změny ve funkci pro přidávání záznamů.

Files:

• database.php (modified) (1 diff)
• stat_functions.php (modified) (5 diffs)

database.php

@@ -7 +7 @@
 {
   var $Prefix = '';
+  var $LastQuery = '';
   
+  function query($Query)
+  {
+    $this->LastQuery = $Query;
+    return(parent::query($Query));
+  }
+
   function select($Table, $What = '*', $Condition = 1)
   {
-    $Query = "SELECT ".$What." FROM `".$this->Prefix.$Table."` WHERE ".$Condition;
-    return($this->query($Query));  
+    return($this->query("SELECT ".$What." FROM `".$this->Prefix.$Table."` WHERE ".$Condition));  
   }
 

stat_functions.php

@@ -24 +24 @@
 function TruncateDigits($Value, $Digits = 4)
 {
-  for($II = 2; $II > -1; $II--)
+  for($II = 2; $II > -6; $II--)
   {
     if($Value >= pow(10, $II))
@@ -105 +105 @@
 }
 
-function AddValue($Measure, $Value)
+function AddValue($Measure, $Value = 0, $Time = 0)
 {
   global $LevelReducing, $MaxLevel, $Database;
-  
-  $Time = time();
+
+  if($Time == 0) $Time = time();
   //$Value = round($Measure['divider'] * $Value);
 
+  echo(TimeToMysqlDateTime($Time)."\n");
+  
   $Result = $Database->select($Measure['DataTable'], '*', 'measure='.$Measure['Id'].' AND level=0 ORDER BY time DESC LIMIT 2');
+  echo($Database->LastQuery."\n");
   if($Result->num_rows == 0) $Database->insert($Measure['DataTable'], array('min' => $Value, 'avg' => $Value, 'max' => $Value, 'level' => 0, 'measure' => $Measure['Id'], 'time' => TimeToMysqlDateTime($Time),
     'continuity' => 0));
@@ -120 +123 @@
     $LastValue = $Result->fetch_array();
     $NextToLastValue = $Result->fetch_array();
-    if(($Time - MysqlDateTimeToTime($LastValue['time'])) < 0.75 * $Measure['Period']) 
-    {
+    echo($Time.' - '.MysqlDateTimeToTime($LastValue['time']).' '.($Time - MysqlDateTimeToTime($LastValue['time'])).' = '.$Measure['Period']);
+    if(($Time - MysqlDateTimeToTime($LastValue['time'])) < 0.75 * $Measure['Period'])
+    {
+      echo('Too short period');
     }
     else 
     {
-      if(($Time - MysqlDateTimeToTime($LastValue['time'])) < 1.25 * $Measure['Period']) $Continuity = 1; 
+      if(($Time - MysqlDateTimeToTime($LastValue['time'])) < 1.25 * $Measure['Period']) $Continuity = 1;
         else $Continuity = 0;
-      if(($LastValue['avg'] == $NextToLastValue['avg']) and ($LastValue['avg'] == $Value) and 
-        ($LastValue['continuity'] == 1) and ($Continuity == 1)) 
-      {
-        //echo('s');
+        //echo('('.$LastValue['avg'].'=='.$NextToLastValue['avg'].') and ('.$LastValue['avg'].' == '.$Value.') and
+        //('.$LastValue['continuity'].' == 1) and ('.$Continuity.' == 1))'."\n");
+      if(($LastValue['avg'] == $NextToLastValue['avg']) and ($LastValue['avg'] == $Value) and
+        ($LastValue['continuity'] == 1) and ($Continuity == 1))
+      {
         $Database->update($Measure['DataTable'], 'time="'.$LastValue['time'].'" AND level=0 AND measure='.$Measure['Id'], array('time' => 'NOW()'));
-      } else 
+        echo($Database->LastQuery."\n");
+      } else
       {
         $Database->insert($Measure['DataTable'], array('min' => $Value, 'avg' => $Value, 'max' => $Value, 'level' => 0, 'measure' => $Measure['Id'], 'time' => TimeToMysqlDateTime($Time),
-          'continuity' => $Continuity));        
+          'continuity' => $Continuity));
+        echo($Database->LastQuery."\n");
       }
     }
-  } 
-    
+  }
+
     // Update levels
     //echo($Time."<br>\n");
@@ -149 +157 @@
       //if($EndTime < $Time) $EndTime = $EndTime + $TimeSegment;
       $StartTime = $EndTime - $TimeSegment;
-      
+
       //echo(" ".$TimeSegment." ".$StartTime.'-'.$EndTime."<br>\n");
       //flush();
-  
+
       // Load values in time range
       $Values = array();
@@ -170 +178 @@
       $Point = ComputeOneValue($StartTime, $EndTime, $Values, $Measure, $Level);
       //print_r($Point);
-      
+
       $Database->delete($Measure['DataTable'], '(time > "'.TimeToMysqlDateTime($StartTime).'") AND 
         (time < "'.TimeToMysqlDateTime($EndTime).'") AND measure='.$Measure['Id'].' AND level='.$Level);