Changeset 44

Timestamp:

Nov 24, 2009, 5:19:21 PM (14 years ago)

Author:

george

Message:

• Přidáno: Třída pro provádění odměrů na straně klienta.
• Přidáno: Podpora pro spouštění s parametry přes příkazový řádek.

Location:

trunk

Files:

• Application/Controller/MeasureClient.php (added)
• Application/Model/Measurement/MeasureClient.php (modified) (2 diffs)
• Application/Model/Measurement/System.php (modified) (2 diffs)
• Application/View/Main.php (modified) (1 diff)
• Base/HTTP.php (modified) (1 diff)
• index.php (modified) (1 diff)

trunk/Application/Model/Measurement/MeasureClient.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/../../../Base/Model.php');
 
 class MeasureClient extends Model
@@ -8 +10 @@
     while($MeasureClient = $DbResult->fetch_assoc())
     {
-      if(class_exists($MeasureClient['MeasureClass']))
+      $DbResult2 = $this->Database->select('MeasureMethod', '*', 'Id='.$MeasureClient['Method']);
+      $MeasureMethod = $DbResult2->fetch_assoc();
+      echo($MeasureClient['MeasureId'].',');
+      include_once(dirname(__FILE__).'/'.$MeasureMethod['MeasureClass'].'.php');
+      $MeasureMethod['MeasureClass'] .= 'Measurement';
+      if(class_exists($MeasureMethod['MeasureClass']))
       {
-        $MeasureClass = new $MeasureClient['MeasureClass']();
-        if(method_exists($MeasureClass, $MeasureClass['Method']))
+        $MeasureClass = new $MeasureMethod['MeasureClass']($this->System);
+        if(method_exists($MeasureClass, $MeasureMethod['Method']))
         {
-          if($MeasureClient['Parameter'] != '') $Value = $Measure->$MeasureClient['Method']($MeasureClient['Parameter']);
-            else $Value = $Measure->$MeasureClient['Method']();
-          file_get_contents($MeasureClient['Host'].$MeasureClient['Path'].'/?MeasureId='.$MeasureClient['MeasureId'].'&amp;Value='.addslashes($Value));
-        } else echo('Metoda '.$MeasureClient['Method'].' neexistuje.');
-      } else echo('Třída '.$MeasureClient['MeasureClass'].' neexistuje.');
-      
+          if($MeasureClient['Parameter'] != '') $Value = $Measure->$MeasureMethod['Method']($MeasureClient['Parameter']);
+            else $Value = $MeasureClass->$MeasureMethod['Method']();
+          echo(file_get_contents('http://'.$MeasureClient['Host'].$MeasureClient['Path'].'/?M=Add&MeasureId='.$MeasureClient['MeasureId'].'&Value='.addslashes($Value)));
+        } else echo('Metoda '.$MeasureMethod['Method'].' neexistuje.');
+      } else echo('Třída '.$MeasureMethod['MeasureClass'].' neexistuje.');
     }
   } 

trunk/Application/Model/Measurement/System.php

@@ -2 +2 @@
 
 // Funkce pro získání stavových informací o systému
-
-function ErrorHandler($errno,$errmsg,$filename,$linenum,$vars)
-{
-}  
 
 include_once(dirname(__FILE__).'/Measurement.php');
@@ -54 +50 @@
   }
 
-  function CpuUsage()
+  function CPUUsage()
   {
     $CpuStateFileName = '/tmp/LastCpuUsage';
-    $LastCpuUsage = unserializa(file_get_contents($CpuStateFileName));
+    $LastCpuUsage = unserialize(file_get_contents($CpuStateFileName));
     //$cpuIDLEprev, $cpuSYSTprev, $cpuUSERprev;
   

trunk/Application/View/Main.php

@@ -206 +206 @@
       if($Measure['Info'] == '') $Measure['Info'] = ' ';
       $GenerationTime = floor(($this->System->GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
-      $Output .= '<tr><td><a href="?Measure='.$Measure['Id'].'&amp;Differential=0">'.$Measure['Description'].'</a></td><td align="center">'.$LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Info'].'</td>';
+      $Output .= '<tr><td><a href="?Measure='.$Measure['Id'].'&amp;Differential=0">'.$Measure['Name'].'</a></td><td align="center">'.$LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Description'].'</td>';
       if(array_key_exists('Debug', $_GET)) $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
       $Output .= '</tr>';

trunk/Base/HTTP.php

@@ -3 +3 @@
 class HTTP
 {
-  function GetQueryStringArray()
+  function GetQueryStringArray($QueryString)
   {
     $Result = array();
-    $Parts = explode('&', $_SERVER['QUERY_STRING']);
+    $Parts = explode('&', $QueryString);
     foreach($Parts as $Part)
     {

trunk/index.php

@@ -4 +4 @@
 $BaseDir = substr($_SERVER['SCRIPT_FILENAME'], 0, strrpos($_SERVER['SCRIPT_FILENAME'], '/'));
 if($BaseDir != '') chdir($BaseDir);
+
+include_once(dirname(__FILE__).'/Base/HTTP.php');
+
+// Is executed from command line?
+if(!isset($_SERVER['REMOTE_ADDR']))
+{
+  $HTTP = new HTTP();
+  $_GET = $HTTP->GetQueryStringArray($_SERVER['argv'][1]);
+}
+print_r($_SERVER);
+print_r($_GET);
 
 include_once(dirname(__FILE__).'/Application/Application.php');