Merge branch 'new-amda-stat' into 'master'

New amda stat See merge request !3

Merge branch 'new-amda-stat' into 'master'
New amda stat See merge request !3
Elena Budnik
2 parents 8ef738e8 81df5ad9
Showing 4 changed files with 49 additions and 3 deletions Show diff stats
src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php
src/Request/ParamInfoRequestClass.php
src/Request/ParamsRequestImpl/ParamsRequestClass.php
src/Request/ParamsRequestImpl/ParamsRequestDataClass.php
@@ -209,6 +209,7 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 		$this->paramsData->setCompilationPath(IHMConfigClass::getCompilationPath());
 		$this->paramsData->setLocalBasePath(IHMConfigClass::getLocalBasePath());
 		$this->paramsData->setManagerFilePath(IHMConfigClass::getProcessManagerFilePath());
+		$this->paramsData->setTask($input->nodeType);
 		$this->input = $input;
 		return $this->unmarshallRequest($input);
@@ -63,7 +63,7 @@ class ParamInfoRequestClass extends RequestAbstractClass
 			switch ($this->requestData->getType()) {
 				case ParamInfoTypeEnumClass::IMPEXPLOTINIT :
 				case ParamInfoTypeEnumClass::PLOTINIT :	
-					$this->runFromParamFile($dom);
+					$this->runFromParamFile($dom);					
 					break;			
 				case ParamInfoTypeEnumClass::PARAMINFO :
 					$this->runFromParamInfoFile($dom);
@@ -76,7 +76,7 @@ class ParamInfoRequestClass extends RequestAbstractClass
 			//Use some internal info - Nothing to do
 			$this->requestData->setSuccess(true);
 		}
-		
+		 
 		return $this->requestData->getSuccess();
 	}
@@ -118,6 +118,21 @@ class ParamsRequestClass extends ProcessRequestClass
 				$this->requestData->setLastErrorMessage('Cannot copy param definition file for '.$key);
 				return false;
 			}
+			// get datasetID for statistics
+			$doc = new DOMDocument("1.0", "UTF-8"); 
+			if (@$doc->load($value)) {
+				$dsID = $doc->getElementsByTagName('dataset_id');
+				if ($dsID->length > 0) {
+					if ($dsID->item(0)->nodeValue)
+						$dsName = $dsID->item(0)->nodeValue;
+					elseif (strpos($key, 'spase_') !== false)
+						$dsName = 'impex';
+					else
+						$dsName = 'unknown';
+						
+					$this->requestData->addDatasetForStat($dsName);
+				}
+			}
 			touch($destinationFile, filemtime($value));
 		}
@@ -160,6 +175,7 @@ class ParamsRequestClass extends ProcessRequestClass
 			$doc->preserveWhiteSpace = false;
 			$doc->formatOutput = true;
+
 			if (!$xmlNode = $value["param"]->toXMLNode($doc))
 			{
 				$this->requestData->setLastErrorMessage('Cannot create params XML file for '.$key);
@@ -175,6 +191,8 @@ class ParamsRequestClass extends ProcessRequestClass
 				return false;
 			}
+			$this->requestData->addDatasetForStat('uploadedData');
+			
 			touch($destinationFile, $value["dateModif"]);
 		}
 		//create and copy local params files
@@ -211,6 +229,11 @@ class ParamsRequestClass extends ProcessRequestClass
 	*/
 	public function run()
 	{
+		$amdaStat = new AmdaStats(IHMConfigClass::getUserName());
+		
+		if (count($this->requestData->getDatasetForStat()) > 0)
+			$amdaStat->addTask(IHMConfigClass::getUserName(), $this->requestData->getTask(), $this->requestData->getDatasetForStat());
+		
 		return parent::run();
 	}
@@ -29,6 +29,8 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
 	private $localParamsToCreateAndCopy   = array();
 	private $paramsToCopy          = array();
 	private $paramId               = "";
+	private $datasetId             = array();
+	private $task                  = "";
 	function __construct()
 	{
@@ -65,6 +67,16 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
 		$this->requestType = $requestType;
 	}
+	public function getTask()
+	{
+		return $this->task;
+	}
+	
+	public function setTask($task)
+	{
+		$this->task = $task;
+	}
+	
 	public function addRequestNode()
 	{
 		$newRequestNode = new RequestNodeClass();
@@ -116,7 +128,17 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
 	{
 		return $this->processParamsToCreate;
 	}
-
+	
+	public function getDatasetForStat()
+	{
+		return $this->datasetId;
+	}
+	
+	public function addDatasetForStat($dsId)
+	{
+		$this->datasetId[] = $dsId;
+	}
+	
 	public function addProcessParamToCreate($paramId, $expression, $expression_info, $getParams, $sampling, $gap, $dateModif, $units, $ytitle)
 	{
 		$newParam = new ParamNodeClass();