Changeset 14

Timestamp:

Oct 17, 2007, 7:53:48 PM (17 years ago)

Author:

george

Message:

Oprava: Funkce pro přestavbu cache.

Files:

• admin.php (modified) (4 diffs)
• graph.php (modified) (1 diff)
• index.php (modified) (1 diff)
• rebuild.php (modified) (1 diff)
• stat_functions.php (modified) (7 diffs)
• style/style.css (modified) (1 diff)

admin.php

@@ -13 +13 @@
   case 'Edit':
     $Output = ShowEdit();  
+    break;
+  case 'RebuildCache':
+    $Output = ShowRebuildCache();  
     break;
   default:
@@ -30 +33 @@
   while($Measure = $Result->fetch_array())
   {
-    array_push($Table['Rows'], array($Measure['Description'], MakeLink('?Operation=Edit&MeasureId='.$Measure['Id'], 'Editovat').' '.MakeLink('?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').' '.MakeLink('?Operation=RebuildCache&MeasureId='.$Measure['Id'], 'Pøestavìt cache')));
   }
   $Output = '<h3>Seznam mìøení</h3>'.Table($Table).MakeLink('?Operation=Add', 'Pøidat');
@@ -39 +42 @@
 {
   global $Database;
-  $DbResult = $Database->select('measure', '*', 'Id='.$_GET['MeasureId']);
+  $DbResult = $Database->select('measure', '*', 'Id='.addslashes($_GET['MeasureId']));
   $Values = array();
   $Values = $DbResult->fetch_array();
@@ -52 +55 @@
 }
 
+function ShowRebuildCache()
+{
+  global $Database;
+  echo("Vytvaøím novou cache...<br>");
+  $DbResult = $Database->select('measure', '*', 'Id='.addslashes($_GET['MeasureId']));
+  $Measure = $DbResult->fetch_array();
+
+  RebuildMeasureCache($Measure);  
+  echo('Dokonèeno<br>');         
+}
+
 ?>

graph.php

@@ -181 +181 @@
   imagettftext($Image, $FontSize, 0, $Width-194, 14, $Green, $FontFile, "Avg.  ".AddPrefixMultipliers($AvgValue, $Measure['Unit']));
   imagettftext($Image, $FontSize, 0, $Width-294, 14, $Blue, $FontFile, "Min.  ".AddPrefixMultipliers($MinValue, $Measure['Unit']));
-  imagestring($Image, 2, 50, 20, 'Vygenerováno za '.$GenerationTime.' sekund', $Black);
+  imagestring($Image, 2, 70, 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, 70, 14, $Black, $FontFile, to_utf8($Measure['Description']));
   imagerectangle($Image, 0, 0, $Width - 1, $Height - 1, $Black);   // Frame border
   imagepng($Image);

index.php

@@ -190 +190 @@
     $RowCount = $RowCount[0];
   }
-  $Result2 = $Database->select($Measure['DataTable'], 'time, avg', 'measure='.$Measure['Id'].' ORDER BY time DESC LIMIT 1');
+  $Result2 = $Database->select($Measure['DataTable'], 'time, avg', 'measure='.$Measure['Id'].' AND level=0 ORDER BY time DESC LIMIT 1');
   if($Result2->num_rows > 0)
   {

rebuild.php

@@ -1 @@
-<?
+<?php
 
-include('error.php');
-include('stat_functions.php');
-include('db.php');
-DB_Init('localhost', 'stat', '', 'statistic');
+include('global.php');
 
 //$Measure = GetMeasureById(12);

stat_functions.php

@@ -249 +249 @@
 function GetTimeRange($Measure, $Level)
 {
-  global $Debug;
+  global $Debug, $Database;
   
   // Get first and last time
-  echo($Measure['Id'].','.$Level.','.StatTableName($Level)."\n"); 
+  //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)
@@ -395 +395 @@
 function RebuildMeasureCache($Measure)
 {
-  global $MaxLevel, $LevelReducing;
-
-  echo('Velicina '.$Measure['Name']."\n");
+  global $MaxLevel, $LevelReducing, $Database;
+
+  echo('Velicina '.$Measure['Name']."<br>\n");
   if($Measure['Continuity'] == 0) $Measure['ContinuityEnabled'] = 0;  // non continuous
     else $Measure['ContinuityEnabled'] = 2;    // continuous graph
 
   // Clear previous items
-  $Result = $Database->select($Measure['DataTable'], 'COUNT(*)', 'level>0 AND measure='.$Measure['Id']);
-  $Row = $Result->fetch_array();
+  $DbResult = $Database->select($Measure['DataTable'], 'COUNT(*)', 'level>0 AND measure='.$Measure['Id']);
+  $Row = $DbResult->fetch_array();
   echo("Mazu starou cache (".$Row[0]." polozek)...");
   $Database->delete($Measure['DataTable'], 'level>0 AND measure='.$Measure['Id']);
-  echo("\n");
+  echo("<br>\n");
 
   for($Level=1; $Level <= $MaxLevel; $Level++)
   {
-    echo('Uroven '.$Level."\n");
+    echo('Uroven '.$Level."<br>\n");
     $TimeRange = GetTimeRange($Measure, $Level-1);
     //echo($Measure['Id'].','.($Level-1)."\n");
@@ -418 +418 @@
     $EndTime = AlignTime($TimeRange['right'], $TimeSegment);
     $BurstCount = 500; 
-    echo('For 0 to '.round(($EndTime - $StartTime) / $TimeSegment / $BurstCount)."\n");
+    echo('For 0 to '.round(($EndTime - $StartTime) / $TimeSegment / $BurstCount)."<br>\n");
     for($I = 0; $I <= round(($EndTime - $StartTime) / $TimeSegment / $BurstCount); $I++)
     {
@@ -425 +425 @@
       $EndTime2 = $StartTime + ($I+1) * $BurstCount * $TimeSegment;
       $Values = array();
-      DB_Select($Measure['DataTable'], '*', 'time > "'.TimeToMysqlDateTime($StartTime2).'" AND 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 = DB_Row())
+      while($Row = $DbResult->fetch_array())
       {
         $Row['time'] = MysqlDateTimeToTime($Row['time']);
@@ -453 +453 @@
             $Point = ComputeOneValue($StartTime3, $EndTime3, $SubValues, $Measure, $Level);
             $Continuity = $SubValues[1]['continuity'];   
-            DB_Insert($Measure['DataTable'], array('level' => $Level, 'measure' => $Measure['Id'], 'min' => $Point['min'], 
+            $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)));
           }        
@@ -462 +462 @@
       //array_pop($NextValues);
     }  
-    echo("Uroven dokoncena\n");         
-    DB_Select($Measure['DataTable'], 'COUNT(*)', 'level='.$Level.' AND measure='.$Measure['Id']);
-    $Row = DB_Row();
-    echo("Vlozeno ".$Row[0]." polozek.\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");
   } 
 }   
@@ -479 +479 @@
   $Result = $Database->select('measure', '*');
   while($Measures[] = $Result->fetch_array());
-  array_pop($Measures);
+    array_pop($Measures);
 
   foreach($Measures as $Measure)

style/style.css

@@ -1 @@
-body {
-        font-family: Arial, Helvetica, sans-serif;
+body
+{
+  font-family :  Arial, sans-serif;
+}
+.BasicTable
+{
+  border-width: thin;
+  border-style: solid;
+  border-color: red;
+  padding: 0px 0px 0px 0px;
+  border-collapse: collapse;
+}
+.BasicTable td
+{
+  border-width: 2px;
+  border-style: solid;
+  border-color: Silver;
+  padding: 2px;
+}
+.BasicTable th
+{
+  border-width: 2px;
+  border-style: solid;
+  border-color: Silver;
+  padding: 2px;
+}
+h3
+{
+  margin-bottom: 3px;
 }