Changeset 36

Timestamp:

Nov 11, 2008, 1:52:03 PM (16 years ago)

Author:

george

Message:

• Upraveno: Funkce pro přidávání hodnot a vytváření ceche úrovní byla vnitřně zobecněna.
• Přidáno: Skript pro přestavbu grafu z tabulky finančních transakcí.
• Upraveno: Trochu zkorigována nápověda do praktičtější podoby.

Files:

• Readme.txt (modified) (1 diff)
• add.php (modified) (2 diffs)
• custom/rebuild_finance.php (added)
• stat_functions.php (modified) (26 diffs)

Readme.txt

@@ -2 +2 @@
 =================
 
-Je potøeba zkopírovat soubor config.sample.php jako config.php a upravit v nìm nastavení.
-Ve složce SQL jsou uloženy definice tabulek measure (struktura i ukázkové data) a tabulky data, kterou je potøeba vytvoøit pro jednotlivá mìøení.
-Ve složce measure_scripts je ukázkový soubor monitor.sample.php, který zajišuje získávání informací o rùzných velièinách v poèítaèi.
- 
+Instalace
+=========
+
+* Pro správnou funkci je požadován webový server (napø. apache), MySql databáze a PHP interpretr. Dále pro vykreslení grafù také knihovna php-gd.
+* Zkopírujte soubor ukázkový config.sample.php jako config.php do stejné složky a upravte v nìm nastavení.
+* Vytvoøete v databázi uživatele statistic a tabulku statistic a doplòte pøístupové údaje do config.php.
+* Proveïtì import ukázkových dat ze souboru full.sql s nejvyšším èíslem revize umístìným ve složce sql. Samotná struktura tabulky measure je v measure.sql a ukázková struktura datové tabulky je v data.sql.
+* Ve složce measure_scripts je ukázkový soubor monitor.sample.php, který zajišuje získávání informací o rùzných velièinách v poèítaèi a jejich plnìní do systému. Zkopírujte jej jako monitor.php a upravte dle potøeb.
+
+Poznámky k vydání
+=================
+
 Verze 3.1 (13.2.2008)
 

add.php

@@ -1 @@
-<?
+<?php
 include('global.php');
 
@@ -9 +9 @@
   if(gethostbyaddr($_SERVER['REMOTE_ADDR']) == $Measure['PermissionAdd']) 
   {
-    AddValue($Measure, $Value);
-    echo('Hodnota '.$Value.' uložena');
-  } else echo('Nemáte oprávnění k aktualizaci zadané veličiny!<br>Vaše adresa: '.gethostbyaddr($_SERVER['REMOTE_ADDR']).'('.$_SERVER['REMOTE_ADDR'].')');
+    AddValue($Measure, array('min' => $Value, 'avg' => $Value, 'max' => $Value));
+    echo('Hodnota '.$Value.' uložena');
+  } else echo('Nemáte oprávnění k aktualizaci zadané veličiny!<br>Vaše adresa: '.gethostbyaddr($_SERVER['REMOTE_ADDR']).'('.$_SERVER['REMOTE_ADDR'].')');
 } else echo('Nebyly zadány potřebné parametry');
 

stat_functions.php

@@ -2 +2 @@
 
 $ValueTypes = array('min', 'avg', 'max');
-$PrefixMultipliers = array(
+$PrefixMultipliers = array
+(
   array('y', 'yocto', pow(10, -24)),
   array('z', 'zepto', pow(10, -21)),
@@ -19 +20 @@
   array('E', 'exa', pow(10, 18)),
   array('Z', 'zetta', pow(10, 21)),
-  array('Y', 'yotta', pow(10, 24)),  
+  array('Y', 'yotta', pow(10, 24)),
 );
 
@@ -27 +28 @@
   {
     if($Value >= pow(10, $II))
-    {  
-      if($Digits < ($II + 1)) $RealDigits = $II + 1; else $RealDigits = $Digits; 
+    {
+      if($Digits < ($II + 1)) $RealDigits = $II + 1; else $RealDigits = $Digits;
       $Value = round($Value / pow(10, $II - $RealDigits + 1)) * pow(10, $II - $RealDigits + 1);
-      break;      
+      break;
     }
   }
@@ -47 +48 @@
   while((($Value / $PrefixMultipliers[$I + $II][2]) > $II) and (($I + $II) >= 0) and (($I + $II) <= count($PrefixMultipliers))) $I = $I + $II;
   $Value = $Value / $PrefixMultipliers[$I][2];
-  
+
   // Truncate digits count
   $Value = TruncateDigits($Value, $Digits);
-    
+
   return($Value.' '.$PrefixMultipliers[$I][0].$Unit);
 }
@@ -56 +57 @@
 function GetMicrotime()
 {
-    list($Usec, $Sec) = explode(" ",microtime());
-    return ((float)$Usec + (float)$Sec);
+  list($Usec, $Sec) = explode(" ", microtime());
+  return ((float)$Usec + (float)$Sec);
 }
 
@@ -63 +64 @@
 {
   $Parts = explode(' ', $Time);
-  $DateParts = explode('-', $Parts[0]); 
+  $DateParts = explode('-', $Parts[0]);
   $TimeParts = explode(':', $Parts[1]);
-  $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]); 
-  return($Result);  
+  $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]);
+  return($Result);
 }
 
 function TimeToMysqlDateTime($Time)
 {
-  return(date('Y-m-d H:i:s', $Time));  
-}
-
-function TimeSegment($Level)
+  return(date('Y-m-d H:i:s', $Time));
+}
+
+function TimeSegment($Base, $Level)
 {
   global $LevelReducing;
-  return(pow($LevelReducing, $Level) * 60);
+
+  return(pow($LevelReducing, $Level) * $Base);
 }
 
@@ -95 +97 @@
 {
   global $Database;
+
   $Result = $Database->select('measure', '*', 'Id='.$Id);
-  if($Result->num_rows > 0) 
-  {
-    $Measure = $Result->fetch_array();
+  if($Result->num_rows > 0)
+  {
+    $Measure = $Result->fetch_assoc();
     if($Measure['Continuity'] == 0) $Measure['ContinuityEnabled'] = 0;  // non continuous
-      else $Measure['ContinuityEnabled'] = 2;    // continuous graph  
-  } else die('M��en� veli�ina nenalezena');
-  return($Measure); 
-}
-
-function AddValue($Measure, $Value = 0, $Time = 0)
+      else $Measure['ContinuityEnabled'] = 2;    // continuous graph
+  } else die('Měřená veličina nenalezena');
+  return($Measure);
+}
+
+function AddValue($Measure, $Value = array('min' => 0, 'avg' => 0, 'max' => 0), $Level = 0, $Time = 0)
 {
   global $LevelReducing, $MaxLevel, $Database;
@@ -111 +114 @@
   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));
-  else if($Result->num_rows == 1) $Database->insert($Measure['DataTable'], array('min' => $Value, 'avg' => $Value, 'max' => $Value, 'level' => 0, 'measure' => $Measure['Id'], 'time' => TimeToMysqlDateTime($Time),
-    'continuity' => 1));
-  else {
+  //echo(TimeToMysqlDateTime($Time).'|'.$Level."\n");
+
+  $Result = $Database->select($Measure['DataTable'], '*', 'measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time DESC LIMIT 2');
+  //echo($Database->LastQuery."\n");
+  if($Result->num_rows == 0) 
+  {
+     $Database->insert($Measure['DataTable'], array('min' => $Value['min'], 'avg' => $Value['avg'], 'max' => $Value['max'], 'level' => $Level, 'measure' => $Measure['Id'], 'time' => TimeToMysqlDateTime($Time), 'continuity' => 0)); 
+     //echo($Database->LastQuery."\n");
+  } else if($Result->num_rows == 1)
+  {
+    $Database->insert($Measure['DataTable'], array('min' => $Value['min'], 'avg' => $Value['avg'], 'max' => $Value['max'], 'level' => $Level, 'measure' => $Measure['Id'], 'time' => TimeToMysqlDateTime($Time), 'continuity' => 1));
+    //echo($Database->LastQuery."\n");
+  } else
+  {
     $LastValue = $Result->fetch_array();
     $NextToLastValue = $Result->fetch_array();
-    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 
+    //echo($Level.': '.$Time.' - '.MysqlDateTimeToTime($LastValue['time']).' '.($Time - MysqlDateTimeToTime($LastValue['time'])).' = '.$Measure['Period']."\n");
+    if((($Time - MysqlDateTimeToTime($LastValue['time'])) < 0.75 * $Measure['Period']) and ($Level == 0))
+    {
+      echo("Too short period\n");
+    }
+    else
     {
       if(($Time - MysqlDateTimeToTime($LastValue['time'])) < 1.25 * $Measure['Period']) $Continuity = 1;
@@ -134 +141 @@
         //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()'));
-        echo($Database->LastQuery."\n");
+      if(($LastValue['min'] == $NextToLastValue['min']) and ($LastValue['min'] == $Value['min']) and ($LastValue['avg'] == $NextToLastValue['avg']) and ($LastValue['avg'] == $Value['avg']) and ($LastValue['max'] == $NextToLastValue['max']) and ($LastValue['max'] == $Value['max']) and ($LastValue['continuity'] == 1) and ($Continuity == 1))
+      {
+        $Database->update($Measure['DataTable'], 'time="'.$LastValue['time'].'" AND level='.$Level.' AND measure='.$Measure['Id'], array('time' => TimeToMysqlDateTime($Time)));
+        //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));
-        echo($Database->LastQuery."\n");
+        $Database->insert($Measure['DataTable'], array('min' => $Value['min'], 'avg' => $Value['avg'], 'max' => $Value['max'], 'level' => $Level, 'measure' => $Measure['Id'], 'time' => TimeToMysqlDateTime($Time), 'continuity' => $Continuity));
+        //echo($Database->LastQuery."\n");
       }
     }
   }
 
-    // Update levels
-    //echo($Time."<br>\n");
-    for($Level = 1; $Level <= $MaxLevel; $Level++)
-    {
-      //echo('Level '.$Level."<br>\n");
-      $TimeSegment = TimeSegment($Level);
-      $EndTime = AlignTime($Time, $TimeSegment);
-      //if($EndTime < $Time) $EndTime = $EndTime + $TimeSegment;
-      $StartTime = $EndTime - $TimeSegment;
-
-      //echo(" ".$TimeSegment." ".$StartTime.'-'.$EndTime."<br>\n");
-      //flush();
-
-      // Load values in time range
-      $Values = array();
-      $Result = $Database->select($Measure['DataTable'], '*', 'time > "'.TimeToMysqlDateTime($StartTime).'" AND time < "'.
-        TimeToMysqlDateTime($EndTime).'" AND measure='.$Measure['Id'].' AND level='.($Level-1).' ORDER BY time');
-      while($Row = $Result->fetch_array())
-      {
-        $Row['time'] = MysqlDateTimeToTime($Row['time']);
-        $Values[] = $Row;
-      }
-      //print_r($Values);
-      //array_pop($Values);      
-
-      // Load subsidary values
-      $Values = array_merge(LoadLeftSideValue($Level-1, $Measure, $StartTime), $Values, LoadRightSideValue($Level-1, $Measure, $EndTime));
-
-      $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);
-      $Continuity = $Values[1]['continuity'];   
-      $Database->insert($Measure['DataTable'], array('level' => $Level, 'measure' => $Measure['Id'], 'min' => $Point['min'], 
-        'avg' => $Point['avg'], 'max' => $Point['max'], 'continuity' => $Continuity, 'time' => TimeToMysqlDateTime($StartTime+($EndTime-$StartTime)/2)));
-
-    }
+  // Update next level
+  if($Level < $MaxLevel)
+  {
+    $Level = $Level + 1;
+    //echo('Level '.$Level."<br>\n");
+    $TimeSegment = TimeSegment($Measure['Period'], 1);
+    $EndTime = AlignTime($Time, $TimeSegment);
+    //if($EndTime < $Time) $EndTime = $EndTime + $TimeSegment;
+    $StartTime = $EndTime - $TimeSegment;
+
+    //echo(" ".$TimeSegment." ".$StartTime.'-'.$EndTime."<br>\n");
+    //flush();
+
+    // Load values in time range
+    $Values = array();
+//.'" AND time < "'.TimeToMysqlDateTime($EndTime).'" AND measure='.$Measure['Id'].' AND level='.($Level - 1).' ORDER BY time');
+    $Result = $Database->select($Measure['DataTable'], '*', 'time > "'.TimeToMysqlDateTime($StartTime).'" AND time < "'.TimeToMysqlDateTime($EndTime).'" AND measure='.$Measure['Id'].' AND level='.($Level - 1).' ORDER BY time');
+    while($Row = $Result->fetch_array())
+    {
+      $Row['time'] = MysqlDateTimeToTime($Row['time']);
+      $Values[] = $Row;
+    }
+    //print_r($Values);
+    //array_pop($Values);
+
+    // Load subsidary values
+    $Values = array_merge(LoadLeftSideValue($Level - 1, $Measure, $StartTime), $Values, LoadRightSideValue($Level - 1, $Measure, $EndTime));
+
+    $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);
+    $Measure['Period'] = $TimeSegment;
+    AddValue($Measure, array('min' => $Point['min'], 'avg' => $Point['avg'], 'max' => $Point['max']), $Level, $StartTime + ($EndTime - $StartTime) / 2);
+  }
 }
 
@@ -198 +200 @@
 {
   global $ValueTypes, $Differential;
-  
-  $NewValue = array('min' => +1000000000000000000, 'avg' => 0, 'max' => -1000000000000000000); 
-  
+
+  $NewValue = array('min' => +1000000000000000000, 'avg' => 0, 'max' => -1000000000000000000);
+
   // Trim outside parts
   foreach($ValueTypes as $ValueType)
@@ -208 +210 @@
   $Values[0]['time'] = $LeftTime;
   foreach($ValueTypes as $ValueType)
-  {   
-    $Values[count($Values)-1][$ValueType] = Interpolation($Values[count($Values)-2]['time'], $Values[count($Values)-2][$ValueType], 
-      $Values[count($Values)-1]['time'], $Values[count($Values)-1][$ValueType], $RightTime);
-  }
-  $Values[count($Values)-1]['time'] = $RightTime;
-  
-  // Perform computation 
+  {
+    $Values[count($Values) - 1][$ValueType] = Interpolation($Values[count($Values) - 2]['time'], $Values[count($Values) - 2][$ValueType],
+      $Values[count($Values) - 1]['time'], $Values[count($Values) - 1][$ValueType], $RightTime);
+  }
+  $Values[count($Values) - 1]['time'] = $RightTime;
+
+  // Perform computation
   foreach($ValueTypes as $ValueType)
-  { 
+  {
     // Compute new value
     for($I = 0; $I < (count($Values) - 1); $I++)
-    {      
-      if($ValueType == 'avg') 
-      {
-        if($Values[$I+1]['continuity'] == $Measure['ContinuityEnabled']);
+    {
+      if($ValueType == 'avg')
+      {
+        if($Values[$I + 1]['continuity'] == $Measure['ContinuityEnabled']);
           else if($Differential == 0)
           {
             $NewValue[$ValueType] = $NewValue[$ValueType] + ($Values[$I+1]['time'] - $Values[$I]['time']) *
               (($Values[$I+1][$ValueType] - $Values[$I][$ValueType]) / 2 + $Values[$I][$ValueType]);
-          } else { 
+          } else
+          {
             $NewValue[$ValueType] = $NewValue[$ValueType] + ($Values[$I+1]['time'] - $Values[$I]['time']) *
              (($Values[$I+1][$ValueType] - $Values[$I][$ValueType]) / 2);
           }
       }
-      else if($ValueType == 'max') 
-      {
-        if($Values[$I+1]['continuity'] == $Measure['ContinuityEnabled'])
+      else if($ValueType == 'max')
+      {
+        if($Values[$I + 1]['continuity'] == $Measure['ContinuityEnabled'])
         {
           if(0 > $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
         }
-        else 
+        else
         {
           if($Differential == 0)
           {
-            if($Values[$I+1][$ValueType] > $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I+1][$ValueType];
+            if($Values[$I + 1][$ValueType] > $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I + 1][$ValueType];
           } else {
-            $Difference = $Values[$I+1][$ValueType] - $Values[$I][$ValueType]; 
+            $Difference = $Values[$I + 1][$ValueType] - $Values[$I][$ValueType];
             if($Difference > $NewValue[$ValueType]) $NewValue[$ValueType] = $Difference;
-          } 
+          }
         }
       }
@@ -252 +255 @@
       {
         //echo($Values[$I+1]['continuity'].'=='.$Measure['ContinuityEnabled'].'<br>'); 
-        if($Values[$I+1]['continuity'] == $Measure['ContinuityEnabled'])
+        if($Values[$I + 1]['continuity'] == $Measure['ContinuityEnabled'])
         {
           if(0 < $NewValue[$ValueType]) $NewValue[$ValueType] = 0;
         }
-        else 
+        else
         {
           if($Differential == 0)
           {
-            if($Values[$I+1][$ValueType] < $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I+1][$ValueType];
+            if($Values[$I + 1][$ValueType] < $NewValue[$ValueType]) $NewValue[$ValueType] = $Values[$I + 1][$ValueType];
           } else {
-            $Difference = $Values[$I+1][$ValueType] - $Values[$I][$ValueType]; 
+            $Difference = $Values[$I + 1][$ValueType] - $Values[$I][$ValueType];
             if($Difference < $NewValue[$ValueType]) $NewValue[$ValueType] = $Difference;
-          } 
+          }
         }
       }
-           
-    }  
-    $NewValue[$ValueType] = $NewValue[$ValueType]; 
+    }
+    $NewValue[$ValueType] = $NewValue[$ValueType];
   }
   //if(($RightTime - $LeftTime) > 0) 
@@ -275 +277 @@
   {
     $NewValue['avg'] = $NewValue['avg'] / ($RightTime - $LeftTime);
-  }  
+  }
   return($NewValue);
   //echo($NewValue['avg'].'<br>');
@@ -284 +286 @@
 {
   global $Debug, $Database;
-  
+
   // Get first and last time
   //echo($Measure['Id'].','.$Level.','.StatTableName($Level)."\n"); 
@@ -314 +316 @@
   $Result = array();
   $DbResult = $Database->select($Measure['DataTable'], '*', 'time > "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time ASC LIMIT 1');
-  if($DbResult->num_rows > 0) 
+  if($DbResult->num_rows > 0)
   {
     $Row = $DbResult->fetch_array();
     $Row['time'] = MysqlDateTimeToTime($Row['time']);
     return(array($Row));
-  } 
-  else 
+  }
+  else
   {
     //$Time = $Values[count($Values)-1]['time'] + 60;
     //array_push($Values, array('time' => $Time, 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0));
-    $Result[] = array('time' => ($Time + TimeSegment($Level)), 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0);
+    $Result[] = array('time' => ($Time + TimeSegment($Measure['Period'], $Level)), 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0);
     $DbResult = $Database->select($Measure['DataTable'], '*', 'time < "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time DESC LIMIT 1');
     if($DbResult->num_rows > 0)
     {
       $Row = $DbResult->fetch_array();
-      array_unshift($Result, array('time' => (MysqlDateTimeToTime($Row['time'])+10), 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0)); 
-    } 
+      array_unshift($Result, array('time' => (MysqlDateTimeToTime($Row['time']) + 10), 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0));
+    }
    // if($Debug) print_r($Result);
     return($Result);
   }
-}  
+}
 
 function LoadLeftSideValue($Level, $Measure, $Time)
 {
   global $Debug, $Database;
+
   $Result = array();
   //echo('SELECT * FROM '.StatTableName($Level). ' WHERE '. 'time < "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time DESC LIMIT 1'."<br>\n");
   $DbResult = $Database->select($Measure['DataTable'], '*', 'time < "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time DESC LIMIT 1');
-  if($DbResult->num_rows > 0) 
+  if($DbResult->num_rows > 0)
   {
     $Row = $DbResult->fetch_array();
     $Row['time'] = MysqlDateTimeToTime($Row['time']);
     return(array($Row));
-  }  
-  else 
+  }
+  else
   {
     //$Time = $Values[0]['time'] - 60;
     //array_unshift($Values, array('time' => $Time, 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0));
-    $Result[] = array('time' => ($Time - TimeSegment($Level)), 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0);
-    
+    $Result[] = array('time' => ($Time - TimeSegment($Measure['Period'], $Level)), 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0);
+
     $DbResult = $Database->select($Measure['DataTable'], '*', 'time > "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time ASC LIMIT 1');
     if($DbResult->num_rows > 0)
     {
       $Row = $DbResult->fetch_array();
-      array_push($Result, array('time' => (MysqlDateTimeToTime($Row['time'])-10), 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0)); 
-    } 
+      array_push($Result, array('time' => (MysqlDateTimeToTime($Row['time'])-10), 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0));
+    }
 //    if($Debug) print_r($Result);
     return($Result);
@@ -368 +371 @@
 {
   global $DivisionCount, $Debug, $Database;
-  
+
   if($Debug) echo('TimeFrom: '.$TimeFrom.'('.TimeToMysqlDateTime($TimeFrom).')<br>');
   if($Debug) echo('TimeTo: '.$TimeTo.'('.TimeToMysqlDateTime($TimeTo).')<br>');
 
   //$AbsoluteTime = GetTimeRange($MeasureId);
-  
+
 //  if(($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and 
 //    ($TimeTo > $AbsoluteLeftTime) and ($TimeTo < $AbsoluteRightTime))
@@ -379 +382 @@
 
   // Load values in time range
-  $Result = $Database->select($Measure['DataTable'], 'time, min, avg, max, continuity', 'time > "'.TimeToMysqlDateTime($TimeFrom).'" AND time < "'.
-    TimeToMysqlDateTime($TimeTo).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time');
+  $Result = $Database->select($Measure['DataTable'], 'time, min, avg, max, continuity', 'time > "'.TimeToMysqlDateTime($TimeFrom).'" AND time < "'.TimeToMysqlDateTime($TimeTo).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time');
 //  echo($Level.' '.TimeToMysqlDateTime($TimeFrom).' '.TimeToMysqlDateTime($TimeTo));
   $Values = array();
@@ -395 +397 @@
 //  die();
   if($Debug) echo('Item count: '.count($Values));
-  
+
   $Points = array();
   if(count($Values) > 0)
   {
     $Values = array_merge(LoadLeftSideValue($Level, $Measure, $TimeFrom), $Values, LoadRightSideValue($Level, $Measure, $TimeTo));
-    
+
     //echo(count($Values).'<br>');
     //echo($TimeFrom.','.$TimeTo.'<br>');
@@ -421 +423 @@
       //print_r($SubValues);
       $Points[] = ComputeOneValue($TimeStart, $TimeEnd, $SubValues, $Measure, $Level);
-      $StartIndex = $EndIndex - 1;  
+      $StartIndex = $EndIndex - 1;
     }
   } else $Points[] = array('min' => 0, 'avg' => 0, 'max' => 0);
@@ -445 +447 @@
   {
     echo('Uroven '.$Level."<br>\n");
-    $TimeRange = GetTimeRange($Measure, $Level-1);
+    $TimeRange = GetTimeRange($Measure, $Level - 1);
     //echo($Measure['Id'].','.($Level-1)."\n");
     //echo(TimeToMysqlDateTime($TimeRange['left']).'-'.TimeToMysqlDateTime($TimeRange['right'])."\n");
-    $TimeSegment = TimeSegment($Level);
+    $TimeSegment = TimeSegment($Measure['Period'], $Level);
     $StartTime = AlignTime($TimeRange['left'], $TimeSegment) - $TimeSegment;
     $EndTime = AlignTime($TimeRange['right'], $TimeSegment);
-    $BurstCount = 500; 
+    $BurstCount = 500;
     echo('For 0 to '.round(($EndTime - $StartTime) / $TimeSegment / $BurstCount)."<br>\n");
     for($I = 0; $I <= round(($EndTime - $StartTime) / $TimeSegment / $BurstCount); $I++)
@@ -459 +461 @@
       $EndTime2 = $StartTime + ($I+1) * $BurstCount * $TimeSegment;
       $Values = array();
-      $DbResult = $Database->select($Measure['DataTable'], '*', 'time > "'.TimeToMysqlDateTime($StartTime2).'" AND time < "'.
-        TimeToMysqlDateTime($EndTime2).'" AND measure='.$Measure['Id'].' AND level='.($Level-1).' ORDER BY time');
+      $DbResult = $Database->select($Measure['DataTable'], '*', 'time > "'.TimeToMysqlDateTime($StartTime2).'" AND time < "'.TimeToMysqlDateTime($EndTime2).'" AND measure='.$Measure['Id'].' AND level='.($Level-1).' ORDER BY time');
       while($Row = $DbResult->fetch_array())
       {
@@ -466 +467 @@
         $Values[] = $Row;
       }
-      
+
       if(count($Values) > 0)
-      {        
-        $Values = array_merge(LoadLeftSideValue($Level-1, $Measure, $StartTime2), $Values, LoadRightSideValue($Level-1, $Measure, $EndTime2));
- 
+      {
+        $Values = array_merge(LoadLeftSideValue($Level - 1, $Measure, $StartTime2), $Values, LoadRightSideValue($Level - 1, $Measure, $EndTime2));
+
         $StartIndex = 0;
         for($B = 0; $B < $BurstCount; $B++)
-        {          
+        {
           echo('.');
           $StartTime3 = $StartTime2 + (($EndTime2 - $StartTime2) / $BurstCount) * $B;
-          $EndTime3 = $StartTime2 + (($EndTime2 - $StartTime2) / $BurstCount) * ($B+1);
-          
+          $EndTime3 = $StartTime2 + (($EndTime2 - $StartTime2) / $BurstCount) * ($B + 1);
+
           $EndIndex = $StartIndex;
           while($Values[$EndIndex]['time'] < $EndTime3) $EndIndex = $EndIndex + 1;
@@ -484 +485 @@
           //print_r($SubValues);
           if(count($SubValues) > 2)
-          {        
+          {
             $Point = ComputeOneValue($StartTime3, $EndTime3, $SubValues, $Measure, $Level);
-            $Continuity = $SubValues[1]['continuity'];   
-            $Database->insert($Measure['DataTable'], array('level' => $Level, 'measure' => $Measure['Id'], 'min' => $Point['min'], 
-              'avg' => $Point['avg'], 'max' => $Point['max'], 'continuity' => $Continuity, 'time' => TimeToMysqlDateTime($StartTime3+($EndTime3-$StartTime3)/2)));
-          }        
-          $StartIndex = $EndIndex - 1;  
+            $Continuity = $SubValues[1]['continuity'];
+            $Database->insert($Measure['DataTable'], array('level' => $Level, 'measure' => $Measure['Id'], 'min' => $Point['min'], 'avg' => $Point['avg'], 'max' => $Point['max'], 'continuity' => $Continuity, 'time' => TimeToMysqlDateTime($StartTime3 + ($EndTime3 - $StartTime3) / 2)));
+          }
+          $StartIndex = $EndIndex - 1;
         }
       }
@@ -496 +496 @@
       //array_pop($NextValues);
     }  
-    echo("Uroven dokoncena<br>\n");         
+    echo("Uroven dokoncena<br>\n");
     $DbResult = $Database->select($Measure['DataTable'], 'COUNT(*)', 'level='.$Level.' AND measure='.$Measure['Id']);
     $Row = $DbResult->fetch_array();
-    echo("Vlozeno ".$Row[0]." polozek.<br>\n");
-  } 
-}   
+    echo("Vloženo ".$Row[0]." položek.<br>\n");
+  }
+}
 
 function RebuildAllMeasuresCache()
 {
   global $Database;
-  
-  
-//  echo("Vytvarim novou cache...\n");
+
+  //  echo("Vytvarim novou cache...\n");
     // Load measures
   $Measures = array();
@@ -517 +516 @@
   foreach($Measures as $Measure)
   {
-    RebuildMeasureCache($Measure);  
-    echo('Velicina dokoncena<br>');         
+    RebuildMeasureCache($Measure);
+    echo('Velicina dokoncena<br>');
   }
 }
@@ -525 +524 @@
 {
   global $Database;
+
   $Database->query('CREATE TABLE `data_'.$Measure['Name'].'` (
 `Time` TIMESTAMP NOT NULL ,