Changeset 59

Timestamp:

Mar 1, 2015, 12:43:56 PM (10 years ago)

Author:

chronos

Message:

• Moved trunk as mvc branch.

Location:

branches

Files:

• mvc (moved) (moved from trunk )
• mvc/Application/CustomOutput.php (modified) (1 diff)
• mvc/Application/Model/Measure.php (modified) (3 diffs)
• mvc/Application/Style/Basic/Style.css (modified) (2 diffs)
• mvc/Application/View/Graph.php (modified) (9 diffs)
• mvc/Application/View/Main.php (modified) (5 diffs)
• mvc/Base/Config/ConfigSample.php (modified) (1 diff)
• mvc/Base/Controller.php (modified) (1 diff)
• mvc/Base/Database.php (modified) (7 diffs)
• mvc/Base/System.php (modified) (7 diffs)
• mvc/Readme.txt (modified) (1 diff)
• old/stat_functions.php (modified) (20 diffs)

branches/mvc/Application/CustomOutput.php

@@ -35 +35 @@
       $Tag->SubElements[] = $ExecutionTimeTag;
       $UsedMemoryTag = new XMLTag('li');
-      $UsedMemoryTag->SubElements = 'Použitá paměť: '.$this->System->AddPrefixMultipliers(memory_get_peak_usage(FALSE), 'B').' / '.ini_get('memory_limit').'B';
+      $PrefixMultiplier = new PrefixMultiplier();
+      $UsedMemoryTag->SubElements = 'Použitá paměť: '.$PrefixMultiplier->Add(memory_get_peak_usage(FALSE), 'B').' / '.ini_get('memory_limit').'B';
       $Tag->SubElements[] = $UsedMemoryTag;
     }

branches/mvc/Application/Model/Measure.php

@@ -41 +41 @@
   }
 
-
   function AddValue($Value = array('Min' => 0, 'Avg' => 0, 'Max' => 0), $Level = 0, $Time = 0)
   {
@@ -48 +47 @@
     //echo(TimeToMysqlDateTime($Time).'|'.$Level."\n");
 
-    $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 2');
+    $Result = $this->Database->select($this->Data['DataTable'], '*', '(Measure='.$this->Data['Id'].') AND '.
+      '(Level='.$Level.') ORDER BY Time DESC LIMIT 2');
     //echo($Database->LastQuery."\n");
     if($Result->num_rows == 0)
     {
-       $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 0));
+       $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 
+         'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 
+         'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 0));
        //echo($Database->LastQuery."\n");
     } else if($Result->num_rows == 1)
     {
-      $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 1));
+      $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 
+        'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 
+        'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 1));
       //echo($Database->LastQuery."\n");
     } else
@@ -71 +75 @@
           else $Continuity = 0;
         echo('('.$LastValue['Avg'].'=='.$NextToLastValue['Avg'].') and ('.$LastValue['Avg'].' == '.$Value.') and ('.$LastValue['Continuity'].' == 1) and ('.$Continuity.' == 1))'."\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))
-        {
-          $this->Database->update($this->Data['DataTable'], '(Time="'.$LastValue['Time'].'") AND (Level='.$Level.') AND (Measure='.$this->Data['Id'].')', array('Time' => $this->Database->TimeToMysqlDateTime($Time)));
+        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))
+        {
+          $this->Database->update($this->Data['DataTable'], '(Time="'.$LastValue['Time'].'") '.
+            'AND (Level='.$Level.') AND (Measure='.$this->Data['Id'].')', array(
+            'Time' => $this->Database->TimeToMysqlDateTime($Time)));
           //echo($this->Database->LastQuery."\n");
         } else
         {
-          $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => $Continuity));
+          $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 
+            'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 
+            'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 
+            'Continuity' => $Continuity));
         }
       }

branches/mvc/Application/Style/Basic/Style.css

@@ -3 +3 @@
   font-family :  Arial, sans-serif;
 }
+
+.Main
+{
+  text-align: center;
+}
+
 .BasicTable
 {
@@ -25 +31 @@
   padding: 2px;
 }
+
+.WideTable
+{
+  border-color: #A0A0A0;
+  border-style: solid;
+  border-width: 1px 1px 0px 0px;
+  border-spacing: 0px;
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;  
+}
+
+.WideTable th
+{
+  border-color: #A0A0A0;
+  border-style: solid;
+  border-width: 0px 0px 1px 1px;
+  padding: 1px 5px 1px 5px;
+  background-color: #F0F0FF
+}
+
+.WideTable td
+{
+  border-color: #A0A0A0;
+  border-style: solid;
+  border-width: 0px 0px 1px 1px;
+  padding: 1px 5px 1px 5px;
+  text-align: center;
+}
+
 h3
 {

branches/mvc/Application/View/Graph.php

@@ -6 +6 @@
 class GraphView extends View
 {
+  var $FontSize;
+  var $FontFileName;
+  var $ValueToImageHeigthCoefficient;
   var $DefaultWidth;
   var $DefaultHeight;
@@ -14 +17 @@
     $this->DefaultWidth = 800;
     $this->DefaultHeight = 200;
+    $this->FontSize = 10;
+    $this->FontFileName = 'Arial.ttf';
+    $this->ValueToImageHeigthCoefficient = 0.9;
   }
 
@@ -35 +41 @@
     if(!array_key_exists('Differential', $_GET)) $Differential = $this->Config['Application']['DefaultVariables']['Differential'];
       else $Differential = addslashes($_GET['Differential']);
-    $VerticalLinesCount = round($Height / ($this->Config['Application']['FontSize'] + 4));
-
+    $VerticalLinesCount = round($Height / ($this->FontSize + 4));
+
+    $PrefixMultiplier = new PrefixMultiplier();
     $StopWatchStart = $this->System->GetMicrotime();
 
@@ -50 +57 @@
     $MeasureMethod = $DbResult2->fetch_assoc();
 
-    $FontSize = $this->Config['Application']['FontSize'];
-    $FontFile = dirname(__FILE__).'/../Style/'.$this->Config['System']['Style'].'/'.$this->Config['Application']['FontFileName'];
+    $FontSize = $this->FontSize;
+    $FontFile = dirname(__FILE__).'/../Style/'.$this->Config['System']['Style'].'/'.$this->FontFileName;
 
     $Level = floor(log(($EndTime - $StartTime) / $Measure->DivisionCount / 60) / log($Measure->LevelReducing)) - 1;
@@ -92 +99 @@
       {
         $PointsMin[] = $Index * $Width / $Measure->DivisionCount;
-        $PointsMin[] = $Height - 1 - ($Points[$Index]['Min'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $this->Config['Application']['ValueToImageHeigthCoefficient'];
+        $PointsMin[] = $Height - 1 - ($Points[$Index]['Min'] - $MinValue) /
+          ($MaxValue - $MinValue) * $Height * $this->ValueToImageHeigthCoefficient;
         $PointsAvg[] = $Index * $Width / $Measure->DivisionCount;
-        $PointsAvg[] = $Height - 1 - ($Points[$Index]['Avg'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $this->Config['Application']['ValueToImageHeigthCoefficient'];
+        $PointsAvg[] = $Height - 1 - ($Points[$Index]['Avg'] - $MinValue) /
+          ($MaxValue - $MinValue) * $Height * $this->ValueToImageHeigthCoefficient;
         $PointsMax[] = $Index * $Width / $Measure->DivisionCount;
-        $PointsMax[] = $Height - 1 - ($Points[$Index]['Max'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $this->Config['Application']['ValueToImageHeigthCoefficient'];
+        $PointsMax[] = $Height - 1 - ($Points[$Index]['Max'] - $MinValue) /
+          ($MaxValue - $MinValue) * $Height * $this->ValueToImageHeigthCoefficient;
         //echo($Index.' - '.$Item.' '.$Points[$Index].'<br/>');
       }
@@ -113 +123 @@
     $PointsMax[] = $Height - 1;
 
-
     //array_unshift($Points, $Height - 1);
     //array_unshift($Points, 0);
     //$Points[] = $Width - 1;
     //$Points[] = $Height - 1;      echo('sds');
-
-
     //print_r($PointsMax);
 
@@ -179 +186 @@
         {
           for($Y = 0; $Y < $Height; $Y = $Y + 1) imagesetpixel($Image, $X, $Y, $Gray);
-          imagettftext($Image, $FontSize, 0, $X - ($BoundBox[2] - $BoundBox[0]) / 2,  $Height - 2, $Black, $FontFile, $Text);
+          imagettftext($Image, $FontSize, 0, $X - ($BoundBox[2] - $BoundBox[0]) / 2,
+            $Height - 2, $Black, $FontFile, $Text);
           $LastTextEnd = $X + ($BoundBox[2] - $BoundBox[0]) / 2;
         }
@@ -190 +198 @@
         $Y = $Height - 1 - ($VerticalLinesDistance * $I);
         //$Y = $Height - 1 - ($VerticalLinesDistance * $I / ($MaxValue - $MinValue) * $this->Config['Application']['ValueToImageHeigthCoefficient'] * $Height);
-        $Text = $this->System->AddPrefixMultipliers(round(($I * $VerticalLinesDistance / $Height / $this->Config['Application']['ValueToImageHeigthCoefficient'] * ($MaxValue - $MinValue) + $MinValue)), $MeasureMethod['Unit'], 3);
+        $Text = $PrefixMultiplier->Add(round(($I * $VerticalLinesDistance /
+          $Height / $this->ValueToImageHeigthCoefficient * ($MaxValue - $MinValue) + $MinValue)), $MeasureMethod['Unit'], 3);
         $BoundBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
         if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
@@ -198 +207 @@
 
       $Left = $Width - 10;
-      $Text = '    Max. '.$this->System->AddPrefixMultipliers($MaxValue, $MeasureMethod['Unit']);
+      $Text = '    Max. '.$PrefixMultiplier->Add($MaxValue, $MeasureMethod['Unit']);
       $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
       $Left -= ($BoundingBox[2] - $BoundingBox[0]);
       imagettftext($Image, $FontSize, 0, $Left, 14, $Red, $FontFile, $Text);
 
-      $Text = '    Avg.  '.$this->System->AddPrefixMultipliers($AvgValue, $MeasureMethod['Unit']);
+      $Text = '    Avg.  '.$PrefixMultiplier->Add($AvgValue, $MeasureMethod['Unit']);
       $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
       $Left -= ($BoundingBox[2] - $BoundingBox[0]);
       imagettftext($Image, $FontSize, 0, $Left, 14, $Green, $FontFile, $Text);
 
-      $Text = '    Min.  '.$this->System->AddPrefixMultipliers($MinValue, $MeasureMethod['Unit']);
+      $Text = '    Min.  '.$PrefixMultiplier->Add($MinValue, $MeasureMethod['Unit']);
       $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
       $Left -= ($BoundingBox[2] - $BoundingBox[0]);

branches/mvc/Application/View/Main.php

@@ -113 +113 @@
     }
 
-    $Output = '<div class="Title">Statistiky</div>';
+    $Output = '<div class="Main">';
+    $Output .= '<div class="Title">Statistiky</div>';
 
     if(!array_key_exists('Operation', $_GET)) $_GET['Operation'] = '';
@@ -160 +161 @@
 
     $Output .= '<br/>'.$this->MeasureTable();
+    $Output .= '</div>';
     return($Output);
   }
@@ -178 +180 @@
   function MeasureTable()
   {
-    $Output = '<table border="1" cellspacing="0" cellpadding="2" style="font-size: small;">';
+    $Output = '<table class="WideTable">';
     $Output .= '<tr><th>Měřená veličina</th><th>Poslední hodnota</th><th>Čas posledního měření</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>';
+    $PrefixMultiplier = new PrefixMultiplier();
     $Result = $this->Database->select('Measure', '*', 'Enabled=1 ORDER BY Description');
     while($Measure = $Result->fetch_array())
@@ -199 +202 @@
         $Row = $Result2->fetch_array();
         $LastMeasureTime = date('j.n.Y G:i:s', $this->Database->MysqlDateTimeToTime($Row['Time']));
-        $LastMeasureValue = $this->System->AddPrefixMultipliers($Row['Avg'], $MeasureMethod['Unit']);
+        $LastMeasureValue = $PrefixMultiplier->Add($Row['Avg'], $MeasureMethod['Unit']);
       } else
       {
@@ -219 +222 @@
 
     //ShowPage($Output);
-    //echo(AddPrefixMultipliers('-0.000000071112345', 'B'));
     return($Output);
   }

branches/mvc/Base/Config/ConfigSample.php

@@ -33 +33 @@
     'PageRefreshPeriod' => 5000,
   ),
+  'SystemPassword' => sha1('test'),
 );

branches/mvc/Base/Controller.php

@@ -7 +7 @@
   function OnAccessDenied($Action, $Id)
   {
-    return($this->System->Output->SystemMessage('Nemáte oprávnění provést akci "'.$Action.'" modulu "'.substr(get_class($this), 0, -10).'" na položce "'.$Id.'"'));
+    return($this->System->Output->SystemMessage('Nemáte oprávnění provést akci "'.
+      $Action.'" modulu "'.substr(get_class($this), 0, -10).'" na položce "'.$Id.'"'));
   }
 

branches/mvc/Base/Database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2009-02-16
-
-class Database extends mysqli
+// Date: 2011-11-25
+
+class DatabaseResult
+{
+  var $PDOStatement;
+  var $num_rows = 0;
+
+  function fetch_assoc()
+  {
+    return($this->PDOStatement->fetch(PDO::FETCH_ASSOC));
+  }
+
+  function fetch_array()
+  {
+    return($this->PDOStatement->fetch(PDO::FETCH_BOTH));
+  }
+
+  function fetch_row()
+  {
+    return($this->PDOStatement->fetch(PDO::FETCH_NUM));
+  }
+}
+
+class Database
 {
   var $Prefix = '';
-  var $Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
-  var $ShowSQLQuery = false;
-  var $ShowSQLError = false;
+  var $Functions;
+  var $Type;
+  var $PDO;
+  var $Error = '';
+  var $insert_id;
+  var $LastQuery = '';
+  var $ShowSQLError;
+  var $ShowSQLQuery;
+
+  function __construct()
+  {
+    $this->Type = 'mysql';  // mysql, pgsql
+    $this->ShowSQLError = false;
+    $this->ShowSQLQuery = false;
+    $this->Functions = array('NOW()', 'CURDATE()', 'CURTIME()', 'UUID()');
+  }
+
+  function Connect($Host, $User, $Password, $Database)
+  {
+    if($this->Type == 'mysql') $ConnectionString = 'mysql:host='.$Host.';dbname='.$Database;
+      else if($this->Type == 'pgsql') $ConnectionString = 'pgsql:dbname='.$Database.';host='.$Host;
+      else $ConnectionString = '';
+    try {
+      $this->PDO = new PDO($ConnectionString, $User, $Password);
+
+    } catch (Exception $E)
+    {
+      unset($this->PDO);
+      throw new Exception($E->getMessage());
+    }
+  }
+
+  function Disconnect()
+  {
+    unset($this->PDO);
+  }
+
+  function Connected()
+  {
+    return(isset($this->PDO));
+  }
+
+  function select_db($Database)
+  {
+    $this->query('USE `'.$Database.'`');
+  }
 
   function query($Query)
   {
-    if($this->ShowSQLQuery)
-    {
-      if(isset($_SERVER['REMOTE_ADDR'])) echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>');
-      else echo($Query."\n");
-    }
-    $Result = parent::query($Query);
-    if(($this->error != '') and ($this->ShowSQLError))
-    {
-      if(isset($_SERVER['REMOTE_ADDR'])) echo('<div><strong>SQL Error: </strong>'.$this->error.'<br />'.$Query.'</div>');
-      echo('SQL Error: '.$this->error.' '.$Query."\n");
-    }
-
+    if(!$this->Connected()) throw new Exception('Not connected to database');
+    $this->LastQuery = $Query;
+    if($this->ShowSQLQuery == true)
+      echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>'."\n");
+    $Result = new DatabaseResult();
+    $Result->PDOStatement = $this->PDO->query($Query);
+    if($Result->PDOStatement)
+    {
+      $Result->num_rows = $Result->PDOStatement->rowCount();
+      $this->insert_id = $this->PDO->lastInsertId();
+    } else
+    {
+      $this->Error = $this->PDO->errorInfo();
+      $this->Error = $this->Error[2];
+      if(($this->Error != '') and ($this->ShowSQLError == true))
+        echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
+        throw new Exception('SQL Error: '.$this->Error.', Query: '.$Query);
+    }
     return($Result);
   }
@@ -45 +115 @@
     {
       $Name .= ',`'.$Key.'`';
-      if(!in_array($Value, $this->Functions)) $Value = '"'.$this->real_escape_string($Value).'"';
+      if(!in_array($Value, $this->Functions))
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
       $Values .= ','.$Value;
     }
@@ -51 +125 @@
     $Values = substr($Values, 1);
     $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
+    $this->insert_id = $this->PDO->lastInsertId();
   }
 
@@ -58 +133 @@
     foreach($Data as $Key => $Value)
     {
-      if(!in_array($Value, $this->Functions)) $Value = '"'.$this->real_escape_string($Value).'"';
+      if(!in_array($Value, $this->Functions))
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
       $Values .= ', `'.$Key.'`='.$Value;
     }
@@ -71 +150 @@
     foreach($Data as $Key => $Value)
     {
-      if(!in_array($Value, $this->Functions)) $Value = '"'.$this->real_escape_string($Value).'"';
+      if(!in_array($Value, $this->Functions))
+      {
+        if(is_null($Value)) $Value = 'NULL';
+        else $Value = $this->PDO->quote($Value);
+      }
       $Name .= ',`'.$Key.'`';
       $Values .= ','.$Value;
@@ -79 +162 @@
     //echo('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES ('.$Values.')<br />');
     $this->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
-    //echo($this->error().'<br/>');
+    //echo($this->error().'<br>');
   }
 
@@ -87 +170 @@
   }
 
-  function TimeToMysqlDateTime($Time)
-  {
-    return(date('Y-m-d H:i:s', $Time));
-  }
-
-  function MysqlDateTimeToTime($Time)
-  {
-    $Parts = explode(' ', $Time);
-    $DateParts = explode('-', $Parts[0]);
-    $TimeParts = explode(':', $Parts[1]);
-    $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]);
-    return($Result);
-  }
-
-  function MysqlDateToTime($Time)
-  {
-    return(MysqlDateTimeToTime($Time.' 0:0:0'));
-  }
-}
+  function real_escape_string($Text)
+  {
+    return(addslashes($Text));
+  }
+
+  public function __sleep()
+  {
+    return array('LastQuery');
+  }
+
+  public function __wakeup()
+  {
+  }
+
+  function MysqlDateTimeToTime($DateTime)
+  {
+        return(MysqlDateTimeToTime($DateTime));
+  }
+
+  function TimeToMysqlDateTime($DateTime)
+  {
+    return(TimeToMysqlDateTime($DateTime));
+  }
+}
+
+function TimeToMysqlDateTime($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('Y-m-d H:i:s', $Time));
+}
+
+function TimeToMysqlDate($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('Y-m-d', $Time));
+}
+
+function TimeToMysqlTime($Time)
+{
+  if($Time == NULL) return(NULL);
+    else return(date('H:i:s', $Time));
+}
+
+function MysqlDateTimeToTime($DateTime)
+{
+  if($DateTime == '') return(NULL);
+  $Parts = explode(' ', $DateTime);
+  $DateParts = explode('-', $Parts[0]);
+  $TimeParts = explode(':', $Parts[1]);
+  $Result = mktime($TimeParts[0], $TimeParts[1], $TimeParts[2], $DateParts[1], $DateParts[2], $DateParts[0]);
+  return($Result);
+}
+
+function MysqlDateToTime($Date)
+{
+  if($Date == '') return(NULL);
+  return(MysqlDateTimeToTime($Date.' 0:0:0'));
+}
+
+function MysqlTimeToTime($Time)
+{
+  if($Time == '') return(NULL);
+  return(MysqlDateTimeToTime('0000-00-00 '.$Time));
+}

branches/mvc/Base/System.php

@@ -1 +1 @@
 <?php
 
+include_once(dirname(__FILE__).'/Version.php');
 include_once(dirname(__FILE__).'/Database.php');
 include_once(dirname(__FILE__).'/Error.php');
@@ -9 +10 @@
 include_once(dirname(__FILE__).'/Output.php');
 include_once(dirname(__FILE__).'/Permission.php');
+include_once(dirname(__FILE__).'/PrefixMultiplier.php');
+include_once(dirname(__FILE__).'/Setup.php');
 
 $MonthNames = array('', 'Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec');
-
-$PrefixMultipliers = array
-(
-  'Binary' => array
-  (
-    'BaseIndex' => 0,
-    'Definition' => array
-    (
-      array('', '', pow(2, 0)),
-      array('Ki', 'kibi', pow(2, 10)),
-      array('Mi', 'mebi', pow(2, 20)),
-      array('Gi', 'gibi', pow(2, 30)),
-      array('Ti', 'tebi', pow(2, 40)),
-      array('Pi', 'pebi', pow(2, 50)),
-      array('Ei', 'exbi', pow(2, 60)),
-      array('Zi', 'zebi', pow(2, 70)),
-      array('Yi', 'yobi', pow(2, 80)),
-    ),
-  ),
-  'Decimal' => array
-  (
-    'BaseIndex' => 8,
-    'Definition' => array
-    (
-      array('y', 'yocto', pow(10, -24)),
-      array('z', 'zepto', pow(10, -21)),
-      array('a', 'atto', pow(10, -18)),
-      array('f', 'femto', pow(10, -15)),
-      array('p', 'piko', pow(10, -12)),
-      array('n', 'nano', pow(10, -9)),
-      array('u', 'mikro', pow(10, -6)),
-      array('m', 'mili', pow(10, -3)),
-      array('', '', pow(10, 0)),
-      array('k', 'kilo', pow(10, 3)),
-      array('M', 'mega', pow(10, 6)),
-      array('G', 'giga', pow(10, 9)),
-      array('T', 'tera', pow(10, 12)),
-      array('P', 'peta', pow(10, 15)),
-      array('E', 'exa', pow(10, 18)),
-      array('Z', 'zetta', pow(10, 21)),
-      array('Y', 'yotta', pow(10, 24)),
-    ),
-  ),
-  'Time' => array
-  (
-    'BaseIndex' => 8,
-    'Definition' => array
-    (
-      array('ys', 'yoctosekunda', pow(10, -24)),
-      array('zs', 'zeptosekunda', pow(10, -21)),
-      array('as', 'attosekunda', pow(10, -18)),
-      array('fs', 'femtosekunda', pow(10, -15)),
-      array('ps', 'pikosekunda', pow(10, -12)),
-      array('ns', 'nanosekunda', pow(10, -9)),
-      array('us', 'mikrosekunda', pow(10, -6)),
-      array('ms', 'milisekunda', pow(10, -3)),
-      array('s', 'sekund', 1),
-      array('minut', 'minuta', 60),
-      array('hodin', 'hodina', 60 * 60) ,
-      array('dnů', 'den', 24 * 60 * 60),
-      array('týdnů', 'týden', 7 * 24 * 60 * 60),
-      array('měsíců', 'měsíc', 30 * 24 * 60 * 60),
-      array('roků', 'rok', 364 * 24 * 60 * 60),
-      array('desitiletí', 'desetiletí', 10 * 364 * 24 * 60 * 60),
-      array('staletí', 'staletí', 100 * 364 * 24 * 60 * 60),
-      array('tisíciletí', 'tisiciletí', 10000 * 364 * 24 * 60 * 60),
-    ),
-  ),
-);
 
 function ErrorHandler()
@@ -112 +46 @@
     $this->Output = new Output($this);
 
+    $Config = array();
+
     $FileName = dirname(__FILE__).'/Config/Config.php';
     if(file_exists($FileName)) include($FileName);
@@ -118 +54 @@
         exit;
       }
-
-    $Config = array();
 
     $FileName = dirname(__FILE__).'/../Application/Config/Config.php';
@@ -138 +72 @@
 
     if(isset($_SERVER['REMOTE_ADDR'])) session_start();
-    $this->Database = new Database($this->Config['Database']['Host'],
-    $this->Config['Database']['User'], $this->Config['Database']['Password'],
-    $this->Config['Database']['Database']);
+    $this->Database = new Database();
+    $this->Database->Connect($this->Config['Database']['Host'],
+      $this->Config['Database']['User'], $this->Config['Database']['Password'],
+      $this->Config['Database']['Database']);
     $this->Database->ShowSQLQuery = $this->Config['System']['ShowSQLQuery'];
     $this->Database->ShowSQLError = $this->Config['System']['ShowSQLError'];
@@ -160 +95 @@
     foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
 
+    // Register and start existing modules
+    $this->Setup = new Setup($this);
+    $this->Setup->Start();
+
     if(array_key_exists('M', $_GET)) $Module = $_GET['M'];
       else $Module = $this->DefaultModule;
 
     $ControllerName = $Module.'Controller';
-    $FileName = dirname(__FILE__).'/../Application/Controller/'.$Module.'.php';
-    if(!file_exists($FileName))
+    if(!class_exists($ControllerName))
     {
-      $this->Output->Show($this->Output->SystemMessage('Soubor '.$FileName.' nenalezen.'));
-      exit;
-    } else include($FileName);
+        // Try to load controller class
+      $FileName = dirname(__FILE__).'/../Application/Controller/'.$Module.'.php';
+      if(!file_exists($FileName))
+      {
+        $this->Output->Show($this->Output->SystemMessage('Soubor '.$FileName.' nenalezen.'));
+        exit;
+      } else include($FileName);
+    }
     if(class_exists($ControllerName))
     {
@@ -190 +133 @@
   {
     return(date('j.n.Y', $Time));
-  }
-
-  function TruncateDigits($Value, $Digits = 4)
-  {
-    for($II = 2; $II > -6; $II--)
-    {
-      if($Value >= pow(10, $II))
-      {
-        if($Digits < ($II + 1)) $RealDigits = $II + 1; else $RealDigits = $Digits;
-        $Value = round($Value / pow(10, $II - $RealDigits + 1)) * pow(10, $II - $RealDigits + 1);
-        break;
-      }
-    }
-    return($Value);
-  }
-
-  function AddPrefixMultipliers($Value, $Unit, $Digits = 4, $PrefixType = 'Decimal')
-  {
-    global $PrefixMultipliers;
-
-    $Negative = ($Value < 0);
-    $Value = abs($Value);
-    if(($Unit == '') and ($PrefixType != 'Time'))
-      return($this->TruncateDigits($Value, $Digits));
-
-    $I = $PrefixMultipliers[$PrefixType]['BaseIndex'];
-    if($Value == 0) return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
-
-    if($Value > 1)
-    {
-      while((($I + 1) <= count($PrefixMultipliers[$PrefixType]['Definition'])) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + 1][2]) > 1))
-        $I = $I + 1;
-    } else
-    if($Value < 1)
-    {
-      while((($I - 1) >= 0) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2]) < 1))
-        $I = $I - 1;
-    }
-    $Value = $Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2];
-
-    // Truncate digits count
-    $Value = $this->TruncateDigits($Value, $Digits);
-    if($Negative) $Value = -$Value;
-    return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
   }
 

branches/mvc/Readme.txt

@@ -6 +6 @@
 
 * 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 ukázkový soubor Base/Config/ConfigSample.php jako Config.php do stejné složky a upravte v něm nastavení.
 * Zkopírujte ukázkový soubor Application/Config/ConfigSample.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ďte 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.
+* Proveďte 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.
 
 

branches/old/stat_functions.php

@@ -79 +79 @@
 
     // 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();
@@ -100 +95 @@
         $Values[] = $Row;
       }
-      //print_r($Values);
       //array_pop($Values);      
 
@@ -107 +101 @@
 
       $Point = ComputeOneValue($StartTime, $EndTime, $Values, $Measure, $Level);
-      //print_r($Point);
 
       $Database->delete($Measure['DataTable'], '(time > "'.TimeToMysqlDateTime($StartTime).'") AND 
@@ -121 +114 @@
 {
   $Y = ($Y2 - $Y1) / ($X2 - $X1) * ($X - $X1) + $Y1;
-  //echo($Y1.'-'.$Y.'-'.$Y2.' '.$X1.'-'.$X.'-'.$X2.'<br>');
   return($Y);
 }
 
+/* Compute one value for upper time level from multiple values */
 function ComputeOneValue($LeftTime, $RightTime, $Values, $Measure, $Level)
 {
   global $ValueTypes, $Differential;
-  
+
   $NewValue = array('min' => +1000000000000000000, 'avg' => 0, 'max' => -1000000000000000000); 
-  
+
   // Trim outside parts
   foreach($ValueTypes as $ValueType)
   {
-    $Values[0][$ValueType] = Interpolation($Values[0]['time'], $Values[0][$ValueType], $Values[1]['time'], $Values[1][$ValueType], $LeftTime);
+    $Values[0][$ValueType] = Interpolation($Values[0]['time'], $Values[0][$ValueType], 
+      $Values[1]['time'], $Values[1][$ValueType], $LeftTime);
   }
   $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($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]);
+            $NewValue[$ValueType] = $NewValue[$ValueType] + ($Values[$I + 1]['time'] - $Values[$I]['time']) *
+              (($Values[$I + 1][$ValueType] - $Values[$I][$ValueType]) / 2 + $Values[$I][$ValueType]);
           } else { 
-            $NewValue[$ValueType] = $NewValue[$ValueType] + ($Values[$I+1]['time'] - $Values[$I]['time']) *
-             (($Values[$I+1][$ValueType] - $Values[$I][$ValueType]) / 2);
+            $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;
-          } 
+          }
         }
       }
       else if($ValueType == 'min') 
       {
-        //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;
@@ -188 +182 @@
           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;
           }
@@ -196 +190 @@
       }
     }
-    $NewValue[$ValueType] = $NewValue[$ValueType]; 
+    $NewValue[$ValueType] = $NewValue[$ValueType];
   }
   //if(($RightTime - $LeftTime) > 0) 
-  if($Measure['Cumulative'] == 0) 
+  if($Measure['Cumulative'] == 0)
   {
     $NewValue['avg'] = $NewValue['avg'] / ($RightTime - $LeftTime);
-  }  
+  }
   return($NewValue);
-  //echo($NewValue['avg'].'<br>');
-  //return(array('min' => rand(0,1), 'avg' => $NewValue['avg'], 'max' => rand(0,1)));
 }
 
@@ -213 +205 @@
 
   // Get first and last time
-  //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)
@@ -239 +230 @@
 {
   global $Debug, $Database;
+  
   $Result = array();
-  $DbResult = $Database->select($Measure['DataTable'], '*', 'time > "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time ASC LIMIT 1');
+  $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) 
   {
@@ -252 +244 @@
     //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);
-    $DbResult = $Database->select($Measure['DataTable'], '*', 'time < "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY time DESC LIMIT 1');
+    $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)
     {
@@ -266 +258 @@
 {
   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');
+  $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) 
   {
@@ -279 +271 @@
     $Result[] = array('time' => ($Time - TimeSegment($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');
+    $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)); 
-    } 
-//    if($Debug) print_r($Result);
+      array_push($Result, array('time' => (MysqlDateTimeToTime($Row['time']) - 10), 
+        'min' => 0, 'avg' => 0, 'max' => 0, 'continuity' => 0));
+    }
     return($Result);
   }
@@ -306 +298 @@
   $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();
-//  echo(DB_NumRows());
-//  $III = 0;
   while($Row = $Result->fetch_array())
   {
-//    echo($III.' '.$Row['time'].' '.memory_get_usage().',');
-//    $III++;
     $Values[] = array('time' => MysqlDateTimeToTime($Row['time']), 'min' => $Row['min'], 'avg' => $Row['avg'], 'max' => $Row['max'], 'continuity' => $Row['continuity']);
   }
  // array_pop($Values);
-//  echo('abc');
-//  die();
   if($Debug) echo('Item count: '.count($Values));
-  
+
   $Points = array();
   if(count($Values) > 0)
@@ -326 +311 @@
     $Values = array_merge(LoadLeftSideValue($Level, $Measure, $TimeFrom), $Values, LoadRightSideValue($Level, $Measure, $TimeTo));
 
-    //echo(count($Values).'<br>');
-    //echo($TimeFrom.','.$TimeTo.'<br>');
-    //echo($Values[0]['time'].'<br>');
     $StartIndex = 0;
     $Points = array();
-    //echo($DivisionCount.'<br>');
     for($I = 0; $I < $DivisionCount; $I++)
     {
@@ -338 +319 @@
       $TimeEnd = $TimeFrom + (($TimeTo - $TimeFrom) / $DivisionCount) * ($I+1);
       //if($Debug) echo('TimeEnd '.$I.': '.$TimeEnd.'('.TimeToMysqlDateTime($TimeEnd).')<br>');
-      //echo($TimeStart.','.$TimeEnd.'<br>');
 
       $EndIndex = $StartIndex;
       while($Values[$EndIndex]['time'] < $TimeEnd) $EndIndex = $EndIndex + 1;
       $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
-      //echo($StartIndex.','.$EndIndex.' '.count($SubValues).'<br>');
-      //print_r($SubValues);
       $Points[] = ComputeOneValue($TimeStart, $TimeEnd, $SubValues, $Measure, $Level);
       $StartIndex = $EndIndex - 1;  
@@ -371 +349 @@
     echo('Uroven '.$Level."<br>\n");
     $TimeRange = GetTimeRange($Measure, $Level-1);
-    //echo($Measure['Id'].','.($Level-1)."\n");
-    //echo(TimeToMysqlDateTime($TimeRange['left']).'-'.TimeToMysqlDateTime($TimeRange['right'])."\n");
     $TimeSegment = TimeSegment($Level);
     $StartTime = AlignTime($TimeRange['left'], $TimeSegment) - $TimeSegment;
@@ -382 +358 @@
       echo($I.' ');
       $StartTime2 = $StartTime + $I * $BurstCount * $TimeSegment;
-      $EndTime2 = $StartTime + ($I+1) * $BurstCount * $TimeSegment;
+      $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())
       {
@@ -394 +370 @@
       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;
@@ -401 +377 @@
           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;
           $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
-          //echo($StartIndex.','.$EndIndex.' '.count($SubValues).'<br>');
-          //print_r($SubValues);
-          if(count($SubValues) > 2)
+         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)));
+            $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;
@@ -425 +400 @@
     $Row = $DbResult->fetch_array();
     echo("Vlozeno ".$Row[0]." polozek.<br>\n");
-  } 
-}   
+  }
+}
 
 function RebuildAllMeasuresCache()
@@ -432 +407 @@
   global $Database;
 
-//  echo("Vytvarim novou cache...\n");
-    // Load measures
+  // Load measures
   $Measures = array();
   $Result = $Database->select('measure', '*');