Changeset 47 for trunk/Application/Model/stat_functions.php

Timestamp:

Jul 27, 2014, 9:14:56 PM (10 years ago)

Author:

chronos

Message:

• Odstraněno: Zbytečná PHP ukončovací značka "?>" z konce všech souborů.

Location:

trunk

Files:

• . (modified) (1 prop)
• Application/Model/stat_functions.php (modified) (10 diffs)

trunk

@@ -1 @@
-
 config.php
+.project

@@ -1 @@
-
 config.php
+.project

trunk/Application/Model/stat_functions.php

@@ -43 +43 @@
   if($Unit == '') return(TruncateDigits($Value, $Digits));
   $I = 8;
-  if($Value > 0) $II = 1; 
+  if($Value > 0) $II = 1;
   else if($Value < 0) $II = -1;
   else $II = 0;
@@ -99 +99 @@
   $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)); 
+  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)
@@ -237 +237 @@
         }
       }
-      else if($ValueType == 'min') 
-      {
-        //echo($Values[$I+1]['continuity'].'=='.$Measure['ContinuityEnabled'].'<br>'); 
+      else if($ValueType == 'min')
+      {
+        //echo($Values[$I+1]['continuity'].'=='.$Measure['ContinuityEnabled'].'<br>');
         if($Values[$I + 1]['continuity'] == $Measure['ContinuityEnabled'])
         {
@@ -258 +258 @@
     $NewValue[$ValueType] = $NewValue[$ValueType];
   }
-  //if(($RightTime - $LeftTime) > 0) 
-  if($Measure['Cumulative'] == 0) 
+  //if(($RightTime - $LeftTime) > 0)
+  if($Measure['Cumulative'] == 0)
   {
     $NewValue['avg'] = $NewValue['avg'] / ($RightTime - $LeftTime);
@@ -273 +273 @@
 
   // 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)
@@ -288 +288 @@
   } else $AbsoluteRightTime = 0;
 
-  if($Debug) 
+  if($Debug)
   {
     echo('AbsoluteLeftTime: '.$AbsoluteLeftTime.'('.TimeToMysqlDateTime($AbsoluteLeftTime).')<br>');
@@ -297 +297 @@
 
 function LoadRightSideValue($Level, $Measure, $Time)
-{ 
+{
   global $Debug, $Database;
   $Result = array();
@@ -362 +362 @@
   //$AbsoluteTime = GetTimeRange($MeasureId);
 
-//  if(($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and 
+//  if(($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and
 //    ($TimeTo > $AbsoluteLeftTime) and ($TimeTo < $AbsoluteRightTime))
 //  {
@@ -480 +480 @@
       // Load values in time range
       //array_pop($NextValues);
-    }  
+    }
     echo("Uroven dokoncena<br>\n");
     $DbResult = $Database->select($Measure['DataTable'], 'COUNT(*)', 'level='.$Level.' AND measure='.$Measure['Id']);
@@ -525 +525 @@
 ) ENGINE = MYISAM ;');
 }
-
-?>

@@ -1 @@
-
 config.php
+.project