Changeset 59 for branches/mvc/Application/Model/Measure.php

Timestamp:

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

Author:

chronos

Message:

• Moved trunk as mvc branch.

Location:

branches/mvc

Files:

• . (moved) (moved from trunk )
• Application/Model/Measure.php (modified) (3 diffs)

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));
         }
       }