simple getStatus

Nathanaël Jourdane
1 parent e1cef6b5
Showing 4 changed files with 47 additions and 11 deletions Show diff stats
php/classes/AmdaAction.php
php/classes/UserMgr.php
php/classes/WebServer.php
php/rest/getStatus.php
@@ -844,9 +844,9 @@ class AmdaAction
 /*
 *   Get Jobs en cours
 */
-	public  function getJobs()
+	public  function getJobs($obj)
 	{
-		require_once(INTEGRATION_SRC_DIR."RequestManager.php");
+        require_once(INTEGRATION_SRC_DIR."RequestManager.php");
 		return $this->executeRequest($obj, FunctionTypeEnumClass::PROCESSRUNNINGINFO);
 	}
  
@@ -865,9 +865,9 @@ class AmdaAction
  
 		if (isset($obj->username) && isset($obj->password) && isset($obj->sessionID))
 		{
-			//$dd = new WSUserMgr();
-            //$dd->init($obj->username,$obj->password,$obj->sessionID);
-			return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support not implemented");
+			$dd = new WSUserMgr();
+            $dd->init($obj->username,$obj->password,$obj->sessionID);
+//			return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support not implemented");
 		}
 		else
 			$dd = new UserMgr();
@@ -885,7 +885,7 @@ class AmdaAction
 		{
 			//if ($dd->getWsSize() > DISK_QUOTA * 100)
 			//	error_log('Natacha! It is time to CLEAN UP IMPEX WS!',1,'nbourrel@irap.omp.eu');
-			return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support for IMPEx not implemented");
+//			return array('success' => false, "message" => "AKKA-KERNEL-INT - WS support for IMPEx not implemented");
 		}
 		else
 		{
@@ -901,7 +901,7 @@ class AmdaAction
  
 	private function executeRequest($obj, $function)
 	{
-		$res = $this->checkUser($obj);
+        $res = $this->checkUser($obj);
 		if (!$res['success']) return $res;
  
 		$requestManager = new RequestManagerClass();
@@ -28,7 +28,7 @@ class UserMgr
 	public $isNewInfo = false;
 	public $isSpecialInfo = null;
  
-	function __construct($username,$password,$sessionID) 
+	function __construct($username = null, $password = null, $sessionID = null)
 	{	 
       // if magic quotes is on, stripslashes
 		if(get_magic_quotes_gpc())
@@ -78,7 +78,7 @@ class UserMgr
 		else if (isset($sessionID))
 			$this->user = $sessionID;
 			$this->amdaClient = new AmdaClient(true);
-	}
+    }
  
 	//TODO if needed?? set session ID
 	protected function setID() {}
@@ -491,9 +491,13 @@ class UserMgr
  
 	public function ddCheckUser() 
 	{
+        error_log("Checking user...");
 		$this->IP = $this->getIPclient();
+        error_log("User: " . $this->user);
+		error_log("IP: " . $this->IP);
  
-		$cmdCheckUser =  DDBIN."DDCheckUser ".$this->IP." ".$this->user." 1> /dev/null 2> /dev/null";   
+		$cmdCheckUser =  DDBIN."DDCheckUser ".$this->IP." ".$this->user." 1> /dev/null 2> /dev/null";
+        error_log("cmdCheckUser: " . $cmdCheckUser);
 		system($cmdCheckUser, $res);
 		return $res;
 	}
@@ -112,6 +112,9 @@ class WebServer
             $this->userPWD = $vars['password'];
         else
             $this->userPWD = 'impexfp7';
+
+
+
         return array('success' => true, 'vars' => $vars);
     }
  
@@ -492,6 +495,16 @@ class WebServer
  
     }
  
+    public function getStatus($data) {
+        $obj = (object)array(
+            "username" => $this->userID,
+            "password" => $this->userPWD,
+            "sessionID" => $this->sessionID
+        );
+
+        $aa = new AmdaAction();
+        return $aa->getJobs($obj);
+    }
  
     public function getParameterList($data)
     {
@@ -927,7 +940,7 @@ class WebServer
                 "fileformat" => $fileformat,
                 "timeformat" => $timeformat,
                 "compression" => $compression,
-                "disablebatch" => true
+                "disablebatch" => false
         );
  
         if (!isset($this->requestManager))
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file getStatus.php
+ * @brief  REST interface for service getParameter
+ *
+ * @version $Id:  $
+ */
+//
+//
+// 3€/m <50Go
+//
+require_once '../config.php';
+
+$amda_ws = new WebServer();
+$result = $amda_ws->getStatus($_GET);
+
+echo '<pre>' . var_export($result, true) . '</pre>';
+?>
 \ No newline at end of file