Changeset 45 for trunk/Application/Model

Timestamp:

Nov 24, 2009, 6:01:08 PM (15 years ago)

Author:

george

Message:

• Přidáno: Kontrolér pro přidávání nových hodnot.
• Opraveno: Informace o použité jednotce načítat z tabulky MeasureMethod.

File:

• trunk/Application/Model/Measure.php (modified) (7 diffs)

trunk/Application/Model/Measure.php

@@ -14 +14 @@
   var $ValueTypes = array('Min', 'Avg', 'Max');
   
-  function Add($Value)
-  {
-    if(gethostbyaddr($_SERVER['REMOTE_ADDR']) == $this->Data['PermissionAdd']) 
-    {
-      $this->AddValue(array('Min' => $Value, 'Avg' => $Value, 'Max' => $Value));
-      $Output = 'Hodnota '.$Value.' uložena';
-    } else throw new Exception('Access denied');
-  }
-  
   function Load($Id)
   {
@@ -57 +48 @@
     //echo(TimeToMysqlDateTime($Time).'|'.$Level."\n");
 
-    $Result = $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) 
     {
-       $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)
     {
-      $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
@@ -77 +68 @@
       } else
       {
-        if(($Time - MysqlDateTimeToTime($LastValue['Time'])) < 1.25 * $this->Data['Period']) $Continuity = 1;
+        if(($Time - $this->Database->MysqlDateTimeToTime($LastValue['Time'])) < 1.25 * $this->Data['Period']) $Continuity = 1;
           else $Continuity = 0;
         echo('('.$LastValue['Avg'].'=='.$NextToLastValue['Avg'].') and ('.$LastValue['Avg'].' == '.$Value.') and ('.$LastValue['Continuity'].' == 1) and ('.$Continuity.' == 1))'."\n");
@@ -83 +74 @@
         {
           $this->Database->update($this->Data['DataTable'], '(Time="'.$LastValue['Time'].'") AND (Level='.$Level.') AND (Measure='.$Measure['Id'].')', array('Time' => $this->Database->TimeToMysqlDateTime($Time)));
-          echo($this->Database->LastQuery."\n");
+          //echo($this->Database->LastQuery."\n");
         } else
         {
-          $Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $Measure['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => $Continuity));
-          echo($this->Database->LastQuery."\n");
+          $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));
         }
       }  
 
       // Update next level
-      if($Level < $MaxLevel)
+      if($Level < $this->MaxLevel)
       {
         $Level = $Level + 1;
@@ -120 +110 @@
           // Load subsidary values
           print_r($Values);
-          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $this->Data, $StartTime), $Values, $this->LoadRightSideValue($Level - 1, $Measure, $EndTime));
+          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $this->Data, $StartTime), $Values, $this->LoadRightSideValue($Level - 1, $EndTime));
           print_r($Values);
 
-          $Point = $this->ComputeOneValue($StartTime, $EndTime, $Values, $this->Data, $Level);
+          $Point = $this->ComputeOneValue($StartTime, $EndTime, $Values, $Level);
         //print_r($Point);
 
           $this->Database->delete($this->Data['DataTable'], '(Time > "'.$this->Database->TimeToMysqlDateTime($StartTime).'") AND (Time < "'.$this->Database->TimeToMysqlDateTime($EndTime).'") AND Measure='.$this->Data['Id'].' AND Level='.$Level);
           $this->Data['Period'] = $TimeSegment;
-          $this->AddValue($this->Data, array('Min' => $Point['Min'], 'Avg' => $Point['Avg'], 'Max' => $Point['Max']), $Level, $StartTime + ($EndTime - $StartTime) / 2);
+          $this->AddValue(array('Min' => $Point['Min'], 'Avg' => $Point['Avg'], 'Max' => $Point['Max']), $Level, $StartTime + ($EndTime - $StartTime) / 2);
         }
       }
@@ -288 +278 @@
       //$Time = $Values[0]['Time'] - 60;
       //array_unshift($Values, array('Time' => $Time, 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
+      if($this->Debug) echo($this->TimeSegment($this->Data['Period'], $Level));
       $Result[] = array('Time' => ($Time - $this->TimeSegment($this->Data['Period'], $Level)), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0);
 
@@ -350 +341 @@
 
         $EndIndex = $StartIndex;
-        //while(($Values[$EndIndex]['Time'] < $TimeEnd) and ($EndIndex < count($Values))) $EndIndex = $EndIndex + 1;
-        while(($Values[$EndIndex]['Time'] < $TimeEnd)) $EndIndex = $EndIndex + 1;
+        while(($Values[$EndIndex]['Time'] < $TimeEnd) and ($EndIndex < count($Values))) $EndIndex = $EndIndex + 1;
+        //while(($Values[$EndIndex]['Time'] < $TimeEnd)) $EndIndex = $EndIndex + 1;
         $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
         //echo($StartIndex.','.$EndIndex.' '.count($SubValues).'<br>');