Changeset 6

Timestamp:

Oct 16, 2007, 10:12:26 PM (17 years ago)

Author:

george

Message:

Přepracovaná vývojová verze s oddělenými datovými tabulkami a různými datovými typy.

Files:

• admin.php (modified) (1 diff)
• config.sample.php (modified) (1 diff)
• custom/convert_data.php (added)
• global.php (modified) (3 diffs)
• graph.php (modified) (5 diffs)
• index.php (modified) (3 diffs)
• measure_scripts/traffic.php (added)
• sql/1_full.sql (added)
• sql/2_full.sql (added)
• stat_functions.php (modified) (23 diffs)
• style/style.css (added)

admin.php

@@ -27 +27 @@
   );
 
-  $Result = $Database->select('measure', '*');
+  $Result = $Database->select('measure', '*', '1 ORDER BY Description');
   while($Measure = $Result->fetch_array())
   {
-    array_push($Table['Rows'], array($Measure['Name'], Link('?Operation=Edit&MeasureId='.$Measure['Id'], 'Editovat').' '.Link('?Operation=Delete&MeasureId='.$Measure['Id'], 'Odstranit')));
+    array_push($Table['Rows'], array($Measure['Description'], MakeLink('?Operation=Edit&MeasureId='.$Measure['Id'], 'Editovat').' '.MakeLink('?Operation=Delete&MeasureId='.$Measure['Id'], 'Odstranit')));
   }
-  $Output = '<h3>Seznam mìøení</h3>'.Table($Table).Link('?Operation=Add', 'Pøidat');
+  $Output = '<h3>Seznam mìøení</h3>'.Table($Table).MakeLink('?Operation=Add', 'Pøidat');
   return($Output); 
 }

config.sample.php

@@ -2 +2 @@
 
 $Config = array(
-  'database' => array(
-    'host' => 'localhost',
-    'user' => 'stat',
-    'password' => 'serepes',
-    'database' => 'statistic',
-    'prefix' => '',
-    'charset' => 'latin2',
+  'Database' => array(
+    'Host' => 'localhost',
+    'User' => 'root',
+    'Password' => '',
+    'Database' => 'statistic',
+    'Prefix' => '',
+    'Charset' => 'latin2',
   ),
-  'add_url' => 'http://localhost/statistic/new/add.php',
+  'AddNewValueUrl' => 'http://localhost/dev/statistic/add.php',
+  'Debug' => 0,
+  'Web' => array(
+    'Title' => 'Statistika',
+    'Charset' => 'iso-8859-2',
+  ),
+  'DivisionCount' => 500,
+  'LevelReducing' => 5,
+  'MaxLevel' => 4,
+  'ReferenceTime' => 0,
+  'ImageWidth' => 750,
+  'ImageHeight' => 200,
+  'ValueToImageHeigthCoefficient' => 0.9,
+  'FontFileName' => 'arial.ttf',
+  'FontSize' => 10,
+  'DefaultVariables' => array(
+    'TimeStart' => time() - 3600*24,
+    'TimeEnd' => time(),
+    'Measure' => 1,
+    'Period' => 'day',
+    'TimeSpecify' => 5,
+  ),
 );
 
+// For back compatibility during development 
+$DivisionCount = $Config['DivisionCount'];
+$ReferenceTime = $Config['ReferenceTime'];
+$LevelReducing = $Config['LevelReducing'];
+$MaxLevel = $Config['MaxLevel'];
+$DefaultWidth = $Config['ImageWidth'];
+$DefaultHeight = $Config['ImageHeight'];
+$K = $Config['ValueToImageHeigthCoefficient']; 
+$FontFile = $Config['FontFileName'];
+$FontSize = $Config['FontSize'];
+
 ?>

global.php

@@ -2 +2 @@
 
 session_start();
-include('config.php');
-include('database.php');
-include('code.php');
-include('types.php');
-include('classes.php');
-include('stat_functions.php');
+include_once('config.php');
+include_once('database.php');
+include_once('code.php');
+include_once('types.php');
+include_once('classes.php');
+include_once('stat_functions.php');
 $Database = new Database($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
 $Database->Prefix = $Config['Database']['Prefix'];
@@ -29 +29 @@
 
 
-function Link($Target, $Title)
+function MakeLink($Target, $Title)
 {
   return('<a href="'.$Target.'">'.$Title.'</a>'); 
@@ -57 +57 @@
   $Class = $Classes[$ClassName];
   $Table = array(
-    'Header' => array('Polo¾ka', 'Hodnota'),
+    'Header' => array('Položka', 'Hodnota'),
     'Rows' => array(),
   );

graph.php

@@ -5 +5 @@
   else $Debug = 0;
   
-$DefaultWidth = 750;
-$DefaultHeight = 200;
-$K = 0.9;   // Coeficient for decreasing graph height 
-$FontFile = 'arial.ttf';
-$FontSize = 10;
-
 if(!array_key_exists('From',$_GET)) die('Musíte zadat èas poèátku');
 $StartTime = addslashes($_GET['From']);
@@ -47 +41 @@
 foreach($Points as $Index => $Item)
 {
-  $Points[$Index]['min'] =  $Points[$Index]['min'] / $Measure['display_divider'];
-  $Points[$Index]['avg'] =  $Points[$Index]['avg'] / $Measure['display_divider'];
-  $Points[$Index]['max'] =  $Points[$Index]['max'] / $Measure['display_divider'];
+  $Points[$Index]['min'] =  $Points[$Index]['min'] / $Measure['Divider'];
+  $Points[$Index]['avg'] =  $Points[$Index]['avg'] / $Measure['Divider'];
+  $Points[$Index]['max'] =  $Points[$Index]['max'] / $Measure['Divider'];
   if($Points[$Index]['avg'] > $MaxValue) $MaxValue = $Points[$Index]['avg'];
   if($Points[$Index]['avg'] < $MinValue) $MinValue = $Points[$Index]['avg'];
@@ -56 +50 @@
   $AvgValue = $AvgValue + $Points[$Index]['avg'];
 }
-$MinValue = round($MinValue * $Measure['display_divider']) / $Measure['display_divider'];
-$MaxValue = round($MaxValue * $Measure['display_divider']) / $Measure['display_divider'];
-$AvgValue = round($AvgValue / count($Points) * $Measure['display_divider']) / $Measure['display_divider'];
+$MinValue = round($MinValue * $Measure['Divider']) / $Measure['Divider'];
+$MaxValue = round($MaxValue * $Measure['Divider']) / $Measure['Divider'];
+$AvgValue = round($AvgValue / count($Points) * $Measure['Divider']) / $Measure['Divider'];
 
 // Generate polygon and recalculate y values to fit graph height 
@@ -91 +85 @@
 
 
-array_unshift($Points, $Height - 1);
-array_unshift($Points, 0);
-$Points[] = $Width - 1;
-$Points[] = $Height - 1;
+//array_unshift($Points, $Height - 1);
+//array_unshift($Points, 0);
+//$Points[] = $Width - 1;
+//$Points[] = $Height - 1;
+
+//print_r($PointsMax);
 
 // Generate image
@@ -182 +178 @@
   $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
 
-  imagettftext($Image, $FontSize, 0, $Width-94, 14, $Red, $FontFile, "Max. ".$MaxValue.' '.$Measure['unit']);
-  imagettftext($Image, $FontSize, 0, $Width-194, 14, $Green, $FontFile, "Avg.  ".$AvgValue.' '.$Measure['unit']);
-  imagettftext($Image, $FontSize, 0, $Width-294, 14, $Blue, $FontFile, "Min.  ".$MinValue.' '.$Measure['unit']);
+  imagettftext($Image, $FontSize, 0, $Width-94, 14, $Red, $FontFile, "Max. ".$MaxValue.' '.$Measure['Unit']);
+  imagettftext($Image, $FontSize, 0, $Width-194, 14, $Green, $FontFile, "Avg.  ".$AvgValue.' '.$Measure['Unit']);
+  imagettftext($Image, $FontSize, 0, $Width-294, 14, $Blue, $FontFile, "Min.  ".$MinValue.' '.$Measure['Unit']);
   imagestring($Image, 2, 50, 20, 'Vygenerováno za '.$GenerationTime.' sekund', $Black);
   //imagestring($Image, 2, 50, 30, 'Level: '.$Level, $Black);
 
-  imagettftext($Image, $FontSize, 0, 50, 14, $Black, $FontFile, to_utf8($Measure['description']));
+  imagettftext($Image, $FontSize, 0, 50, 14, $Black, $FontFile, to_utf8($Measure['Description']));
   imagerectangle($Image, 0, 0, $Width - 1, $Height - 1, $Black);   // Frame border
   imagepng($Image);

index.php

@@ -98 +98 @@
 ); 
 
-$Variables = array(
-  'TimeStart' => time() - 3600*24,
-  'TimeEnd' => time(),
-  'Measure' => 1,
-  'Period' => 'day',
-  'TimeSpecify' => 0,
-);
-
-foreach($Variables as $Index => $Variable)
+foreach($Config['DefaultVariables'] as $Index => $Variable)
 {
   if(!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
@@ -182 +174 @@
 
 $Output .= '<table border="1" cellspacing="0" cellpadding="2" style="font-size: small;">';
-$Output .= '<tr><th>Mìøená velièina</th><th>Èas posledního mìøení</th><th>Poslední hodnota</th><th>Interpolace</th><th>Poznámky</th></tr>';
+$Output .= '<tr><th>Mìøená velièina</th><th>Èas posledního mìøení</th><th>Poslední hodnota</th><th>Interpolace</th><th>Poznámky</th>';
+if(array_key_exists('Debug', $_GET)) $Output .= '<th>Poèet polo¾ek</th><th>Èas vykonání</th>';
+$Output .= '</tr>';
 $Database->select_db('measure');
 $Result = $Database->select('measure', '*', 'Enabled=1 AND PermissionView="all" OR PermissionView="'.gethostbyaddr($_SERVER['REMOTE_ADDR']).'" ORDER BY Description');
@@ -190 +184 @@
 {
   $StopWatchStart = GetMicrotime();
-//  DB_Select('stat_data', 'COUNT(*)', 'measure='.$Measure['id']);
-//  $RowCount = DB_Row();
-//  $RowCount = $RowCount[0];
-//  $RowCount = 0;
-  $Result2 = $Database->select('stat_data', 'time, avg', 'measure='.$Measure['id'].' ORDER BY time DESC LIMIT 1');
+  if(array_key_exists('Debug', $_GET))
+  {  
+    $DbResult = $Database->select($Measure['DataTable'], 'COUNT(*)', 'measure='.$Measure['Id']);
+    $RowCount = $DbResult->fetch_array();
+    $RowCount = $RowCount[0];
+  }
+  $Result2 = $Database->select($Measure['DataTable'], 'time, avg', 'measure='.$Measure['Id'].' ORDER BY time DESC LIMIT 1');
   if($Result2->num_rows > 0)
   {
     $Row = $Result2->fetch_array();
     $LastMeasureTime = date('j.n.Y G:i:s', MysqlDateTimeToTime($Row['time']));
-    $LastMeasureValue = round($Row['avg'] / $Measure['display_divider']);
+    $LastMeasureValue = round($Row['avg'] / $Measure['Divider']);
   } else {
     $LastMeasureTime = '&nbsp;';
     $LastMeasureValue = '&nbsp;';
   }
-  if($Measure['continuity'] == 1) $Interpolate = 'Ano'; else $Interpolate = 'Ne';
-  if($Measure['info'] == '') $Measure['info'] = '&nbsp;';
+  if($Measure['Continuity'] == 1) $Interpolate = 'Ano'; else $Interpolate = 'Ne';
+  if($Measure['Info'] == '') $Measure['Info'] = '&nbsp;';
   $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
-  $Output .= '<tr><td><a href="?Measure='.$Measure['id'].'">'.$Measure['description'].'</a></td><td align="center">'.$LastMeasureValue.' '.$Measure['display_unit'].'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['info'].'</td>';
-  //<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td></tr>');
-  flush();
+  $Output .= '<tr><td><a href="?Measure='.$Measure['Id'].'">'.$Measure['Description'].'</a></td><td align="center">'.$LastMeasureValue.' '.$Measure['Unit'].'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Info'].'</td>';
+  if(array_key_exists('Debug', $_GET)) $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
+  $Output .= '</tr>';
 }
 $Output .= '</table>';

stat_functions.php

@@ -1 +1 @@
 <?php
-
-$DivisionCount = 500;
-$ReferenceTime = 0;
-$LevelReducing = 5;
-$MaxLevel = 4;
 
 $ValueTypes = array('min', 'avg', 'max');
@@ -36 +31 @@
 function StatTableName($Level)
 {
-  if($Level == 0) return('stat_data');
-    else return('stat_data_cache');
+  if($Level == 0) return('data');
+    else return('data_cache');
 }
 
@@ -49 +44 @@
 {
   global $Database;
-  $Result = $Database->select('stat_measure', '*', 'id='.$Id);
+  $Result = $Database->select('measure', '*', 'Id='.$Id);
   if($Result->num_rows > 0) 
   {
     $Measure = $Result->fetch_array();
-    if($Measure['continuity'] == 0) $Measure['ContinuityEnabled'] = 0;  // non continuous
+    if($Measure['Continuity'] == 0) $Measure['ContinuityEnabled'] = 0;  // non continuous
       else $Measure['ContinuityEnabled'] = 2;    // continuous graph  
   } else die('Mìøená velièina nenalezena');
@@ -64 +59 @@
   
   $Time = time();
-  $Value = round($Measure['divider']*$Value);
-
-  $Result = $Databse->select('stat_data', '*', 'measure='.$Measure['id'].' AND level=0 ORDER BY time DESC LIMIT 2');
-  if($Result->num_rows == 0) $Database->insert('stat_data', array('min' => $Value, 'avg' => $Value, 'max' => $Value, 'level' => 0, 'measure' => $Measure['id'], 'time' => TimeToMysqlDateTime($Time),
+  //$Value = round($Measure['divider'] * $Value);
+
+  $Result = $Databse->select($Measure['DataTable'], '*', 'measure='.$Measure['Id'].' AND level=0 ORDER BY time DESC LIMIT 2');
+  if($Result->num_rows == 0) $Database->insert('stat_data', 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('stat_data', array('min' => $Value, 'avg' => $Value, 'max' => $Value, 'level' => 0, 'measure' => $Measure['id'], 'time' => TimeToMysqlDateTime($Time),
+  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 {
@@ -85 +80 @@
       {
         echo('s');
-        $Database->update('stat_data', 'time="'.$LastValue['time'].'" AND level=0 AND measure='.$Measure['id'], array('time' => 'NOW()'));
+        $Database->update($Measure['DataTable'], 'time="'.$LastValue['time'].'" AND level=0 AND measure='.$Measure['Id'], array('time' => 'NOW()'));
       } else 
       {
-        $Database->insert('stat_data', array('min' => $Value, 'avg' => $Value, 'max' => $Value, 'level' => 0, 'measure' => $Measure['id'], 'time' => TimeToMysqlDateTime($Time),
+        $Database->insert($Measure['DataTable'], array('min' => $Value, 'avg' => $Value, 'max' => $Value, 'level' => 0, 'measure' => $Measure['Id'], 'time' => TimeToMysqlDateTime($Time),
           'continuity' => $Continuity));        
       }
@@ -109 +104 @@
       // Load values in time range
       $Values = array();
-      $Result = $Database->select(StatTableName($Level-1), '*', 'time > "'.TimeToMysqlDateTime($StartTime).'" 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())
       {
@@ -126 +121 @@
       //print_r($Point);
       
-      $Database->delete(StatTableName($Level), '(time > "'.TimeToMysqlDateTime($StartTime).'") AND 
-        (time < "'.TimeToMysqlDateTime($EndTime).'") AND measure='.$Measure['id'].' AND level='.$Level);
+      $Database->delete($Measure['DataTable'], '(time > "'.TimeToMysqlDateTime($StartTime).'") AND 
+        (time < "'.TimeToMysqlDateTime($EndTime).'") AND measure='.$Measure['Id'].' AND level='.$Level);
       $Continuity = $Values[1]['continuity'];   
-      $Database->insert(StatTableName($Level), array('level' => $Level, 'measure' => $Measure['id'], 'min' => $Point['min'], 
+      $Database->insert($DataTable, array('level' => $Level, 'measure' => $Measure['Id'], 'min' => $Point['min'], 
         'avg' => $Point['avg'], 'max' => $Point['max'], 'continuity' => $Continuity, 'time' => TimeToMysqlDateTime($StartTime+($EndTime-$StartTime)/2)));
 
@@ -203 +198 @@
   }
   //if(($RightTime - $LeftTime) > 0) 
-  if($Measure['cumulative'] == 0) $NewValue['avg'] = $NewValue['avg'] / ($RightTime - $LeftTime);  
+  if($Measure['Cumulative'] == 0) $NewValue['avg'] = $NewValue['avg'] / ($RightTime - $LeftTime);  
   return($NewValue);
   //echo($NewValue['avg'].'<br>');
@@ -214 +209 @@
   
   // Get first and last time
-  echo($Measure['id'].','.$Level.','.StatTableName($Level)."\n"); 
-  $Result = $Database->select(StatTableName($Level), '*', 'measure='.$Measure['id'].' AND level='.$Level.' ORDER BY time LIMIT 1');
+  echo($Measure['Id'].','.$Level.','.StatTableName($Level)."\n"); 
+  $Result = $Database->select($Measure['DataTable'], '*', 'measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time LIMIT 1');
   if($Result->num_rows > 0)
   {
@@ -222 +217 @@
   } else $AbsoluteLeftTime = 0;
 
-  $Result = $Database->select(StatTableName($Level), '*', 'measure='.$Measure['id'].' AND level='.$Level.' ORDER BY time DESC LIMIT 1');
+  $Result = $Database->select($Measure['DataTable'], '*', 'measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time DESC LIMIT 1');
   if($Result->num_rows > 0)
   {
@@ -239 +234 @@
 function LoadRightSideValue($Level, $Measure, $Time)
 { 
-  global $Debug;
+  global $Debug, $Database;
   $Result = array();
-  $Result = $Database->select(StatTableName($Level), '*', 'time > "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['id'].' AND level='.$Level.' ORDER BY time ASC LIMIT 1');
-  if($Result->num_rows > 0) 
-  {
-    $Row = $Result->fetch_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) 
+  {
+    $Row = $DbResult->fetch_array();
     $Row['time'] = MysqlDateTimeToTime($Row['time']);
     return(array($Row));
@@ -253 +248 @@
     //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 = $Database->select(StatTableName($Level), '*', 'time < "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['id'].' AND level='.$Level.' ORDER BY time DESC LIMIT 1');
-    if($Result->num_rows > 0)
-    {
-      $Row = $Result->fetch_array();
+    $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)); 
     } 
@@ -266 +261 @@
 function LoadLeftSideValue($Level, $Measure, $Time)
 {
-  global $Debug;
+  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");
-  $Result = $Database->select(StatTableName($Level), '*', 'time < "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['id'].' AND level='.$Level.' ORDER BY time DESC LIMIT 1');
-  if($Result->num_rows > 0) 
-  {
-    $Row = $Result->fetch_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) 
+  {
+    $Row = $DbResult->fetch_array();
     $Row['time'] = MysqlDateTimeToTime($Row['time']);
     return(array($Row));
@@ -282 +277 @@
     $Result[] = array('time' => ($Time - TimeSegment($Level)), 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0);
     
-    $Result = $Database->select(StatTableName($Level), '*', 'time > "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['id'].' AND level='.$Level.' ORDER BY time ASC LIMIT 1');
-    if($Result->num_rows > 0)
-    {
-      $Row = $Result->fetch_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)
+    {
+      $Row = $DbResult->fetch_array();
       array_push($Result, array('time' => (MysqlDateTimeToTime($Row['time'])-10), 'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0)); 
     } 
@@ -295 +290 @@
 function GetValues($Measure, $TimeFrom, $TimeTo, $Level)
 {
-  global $DivisionCount, $Debug;
+  global $DivisionCount, $Debug, $Database;
   
   if($Debug) echo('TimeFrom: '.$TimeFrom.'('.TimeToMysqlDateTime($TimeFrom).')<br>');
@@ -307 +302 @@
 
   // Load values in time range
-  $Result = $Database->select(StatTableName($Level), '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();
@@ -334 +329 @@
     $StartIndex = 0;
     $Points = array();
+    //echo($DivisionCount.'<br>');
     for($I = 0; $I < $DivisionCount; $I++)
     {
@@ -358 +354 @@
   global $MaxLevel, $LevelReducing;
 
-  echo('Velicina '.$Measure['name']."\n");
-  if($Measure['continuity'] == 0) $Measure['ContinuityEnabled'] = 0;  // non continuous
+  echo('Velicina '.$Measure['Name']."\n");
+  if($Measure['Continuity'] == 0) $Measure['ContinuityEnabled'] = 0;  // non continuous
     else $Measure['ContinuityEnabled'] = 2;    // continuous graph
 
   // Clear previous items
-  $Result = $Database->select('stat_data_cache', 'COUNT(*)', 'level>0 AND measure='.$Measure['id']);
+  $Result = $Database->select($Measure['DataTable'], 'COUNT(*)', 'level>0 AND measure='.$Measure['Id']);
   $Row = $Result->fetch_array();
   echo("Mazu starou cache (".$Row[0]." polozek)...");
-  $Database->delete('stat_data_cache', 'level>0 AND measure='.$Measure['id']);
+  $Database->delete($Measure['DataTable'], 'level>0 AND measure='.$Measure['Id']);
   echo("\n");
 
@@ -373 +369 @@
     echo('Uroven '.$Level."\n");
     $TimeRange = GetTimeRange($Measure, $Level-1);
-    //echo($Measure['id'].','.($Level-1)."\n");
+    //echo($Measure['Id'].','.($Level-1)."\n");
     //echo(TimeToMysqlDateTime($TimeRange['left']).'-'.TimeToMysqlDateTime($TimeRange['right'])."\n");
     $TimeSegment = TimeSegment($Level);
@@ -386 +382 @@
       $EndTime2 = $StartTime + ($I+1) * $BurstCount * $TimeSegment;
       $Values = array();
-      DB_Select(StatTableName($Level-1), '*', 'time > "'.TimeToMysqlDateTime($StartTime2).'" AND time < "'.
-        TimeToMysqlDateTime($EndTime2).'" AND measure='.$Measure['id'].' AND level='.($Level-1).' ORDER BY time');
+      DB_Select($Measure['DataTable'], '*', 'time > "'.TimeToMysqlDateTime($StartTime2).'" AND time < "'.
+        TimeToMysqlDateTime($EndTime2).'" AND measure='.$Measure['Id'].' AND level='.($Level-1).' ORDER BY time');
       while($Row = DB_Row())
       {
@@ -414 +410 @@
             $Point = ComputeOneValue($StartTime3, $EndTime3, $SubValues, $Measure, $Level);
             $Continuity = $SubValues[1]['continuity'];   
-            DB_Insert(StatTableName($Level), array('level' => $Level, 'measure' => $Measure['id'], 'min' => $Point['min'], 
+            DB_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)));
           }        
@@ -424 +420 @@
     }  
     echo("Uroven dokoncena\n");         
-    DB_Select('stat_data', 'COUNT(*)', 'level='.$Level.' AND measure='.$Measure['id']);
+    DB_Select($Measure['DataTable'], 'COUNT(*)', 'level='.$Level.' AND measure='.$Measure['Id']);
     $Row = DB_Row();
     echo("Vlozeno ".$Row[0]." polozek.\n");
@@ -438 +434 @@
     // Load measures
   $Measures = array();
-  $Result = $Database->select('stat_measure', '*');
+  $Result = $Database->select('measure', '*');
   while($Measures[] = $Result->fetch_array());
   array_pop($Measures);