orbit in km for impex

Elena.Budnik
1 parent 6a3bb8f6
Showing 3 changed files with 55 additions and 30 deletions Show diff stats
php/RemoteDataCenter/ImpexParamManager.php
php/RemoteDataCenter/makeOrbitsArgs.php
php/config.php
@@ -20,14 +20,14 @@ class ImpexParamManager
 	protected $baseManager = null;
 	protected $votManager = null;
 	protected $impex_pairs = array("/" => "_", ":" => "_");
+	protected $webAlias;
  
 	public $startTime, $stopTime;
  
 	private $impexParamInfo = null;
  
-	//TODO
-	private $scale = array("km" => 1, "Rme" => 2438, "Rv" => 6052, "Re" => 6371, "Rma" => 3396, "Rm" => 3396,
-									"Rj" => 71492, "Rs" => 60268, "Ru" => 25559, "Rn" => 24764);
+// 	private $scale = array("km" => 1, "Rme" => 2438, "Rv" => 6052, "Re" => 6371, "Rma" => 3396, "Rm" => 3396,
+// 									"Rj" => 71492, "Rs" => 60268, "Ru" => 25559, "Rn" => 24764);
  
 	function __construct() 
 	{		
@@ -35,6 +35,8 @@ class ImpexParamManager
  
 		date_default_timezone_set('UTC');
 		ini_set("soap.wsdl_cache_enabled", "0");
+	
+		$this->webAlias = webAlias.IHMConfigClass::getRelativeResultPath();;	 
 	}
  
 	public function getImpexFullParamId($param_id, $templateArgs = NULL) {
@@ -115,8 +117,11 @@ class ImpexParamManager
  
 			$localFile = $this->center->getFileName($this->resourceID, $templateArgs,$start);
  
-			if (!copy($remoteFile, IHMConfigClass::getLocalBasePath().$localFile)) {
-				throw new Exception('Cannot wget '.$remoteFile);       
+			if (!copy($remoteFile, IHMConfigClass::getLocalBasePath().$localFile)) {			
+				if ($this->orbitTempFolder)
+					CommonClass::rrmdir($this->orbitTempFolder);
+					
+				throw new Exception('Cannot wget '.$remoteFile); 				
 			}
  
 			if ($this->center->outputFormat == "VOTable")
@@ -124,13 +129,21 @@ class ImpexParamManager
 				if (!$this->votManager)
 						$this->votManager = new VOTableMgr();
  
-				if (!$this->votManager->load(IHMConfigClass::getLocalBasePath().$localFile))
-						throw new Exception('Cannot load '.$localFile);   
+				if (!$this->votManager->load(IHMConfigClass::getLocalBasePath().$localFile))				
+				{
+					if ($this->orbitTempFolder)
+						CommonClass::rrmdir($this->orbitTempFolder);
+						
+					throw new Exception('Cannot load '.$localFile);
+				}
  
 				if (!$this->votManager->isData()) 
 				{
 					unlink(IHMConfigClass::getLocalBasePath().$localFile);
-					throw new Exception('Empty file '.$localFile);	
+					if ($this->orbitTempFolder)
+						CommonClass::rrmdir($this->orbitTempFolder);
+						
+					throw new Exception('Empty file '.$localFile);					
 				}
  
 				if ($this->vectorList)
@@ -260,8 +273,10 @@ class ImpexParamManager
 				{				
 					$viID = $this->addFileToDb($mask, $localFile, $startTime, $stopTime, 'cdf');
 				}
+				
 				if ($this->orbitTempFolder)
-					CommonClass::rrmdir($this->orbitTempFolder);
+					CommonClass::rrmdir($this->orbitTempFolder);					
+				
 			}
 		}
 		// nothing to add
@@ -380,11 +395,11 @@ class ImpexParamManager
 		} 
  
 		$this->orbitTempFolder = IHMConfigClass::getRequestPath().$downloadResult['folder'];
-		
+	  
 		try 
 		{
 		   $this->convertVot($paramId, $downloadResult['result']);
-			$orbitURL =  "http://apus.irap.omp.eu/NEWAMDA/data/budnik/RES/".$downloadResult['folder']."/".$downloadResult['result'].".vot";
+			$orbitURL = $this->webAlias.$downloadResult['folder']."/".$downloadResult['result'].".vot";
  
 			return $orbitURL;
 		}
@@ -471,17 +486,18 @@ class ImpexParamManager
 		}
 		//TODO unit from output VOT file
 		/*----------------- temporary-----------------*/
-		  $temp =  new DomDocument("1.0");
-		  $temp->load(IHMConfigClass::getLocalParamDBPath().$paramID.".xml");
-		  $unit = $temp->getElementsByTagName('units')->item(0)->nodeValue;
+// 		  $temp =  new DomDocument("1.0");
+// 		  $temp->load(IHMConfigClass::getLocalParamDBPath().$paramID.".xml");
+// 		  $unit = $temp->getElementsByTagName('units')->item(0)->nodeValue;
  
+		 $unit = 'km';
 		/*----------------- temporary-----------------*/
 		if ($firstTD > 0)
 		{			
-			if (array_key_exists($unit, $this->scale)) 
+			/*if (array_key_exists($unit, $this->scale)) 
 				$unitScale = $this->scale[$unit];
 			else
-				throw new Exception("Undefined unit ".$unit);	
+				throw new Exception("Undefined unit ".$unit);*/	
  
 			$table->removeChild($fields->item($firstTD));
  
@@ -491,7 +507,7 @@ class ImpexParamManager
 				$new_field->appendChild(new DOMAttr('ID', $comp));
 				$new_field->appendChild(new DOMAttr('name', $comp));
 				$new_field->appendChild(new DOMAttr('datatype', $datatype));				 
-				$new_field->appendChild(new DOMAttr('unit', 'km')); // $unit
+				$new_field->appendChild(new DOMAttr('unit',  $unit)); // $unit
 				$new_field->appendChild(new DOMAttr('ucd', 'pos.cartesian.'.$comp));
  
 				$table->insertBefore($new_field,$data);
@@ -507,7 +523,8 @@ class ImpexParamManager
  
 				foreach ($values as $value)
 				{
-					$td = $dom->createElement('TD', $value*$unitScale); //3400
+					//$td = $dom->createElement('TD', $value*$unitScale); //3400
+					$td = $dom->createElement('TD', $value);
 					$tr->appendChild($td);
 				}
 			}	
@@ -14,18 +14,22 @@
 	if (!defined('SimuTargetsXml'))
 		exit('SimuTargetsXml is not defined in config.php'.PHP_EOL);	
  
-	if (!file_exists(orbitsXml))
-			exit("ERROR : NO Orbites.xml FILE !!! Run makeOrbitsList.php".PHP_EOL);
+// 	if (!file_exists(orbitsXml))
+// 			exit("ERROR : NO Orbites.xml FILE !!! Run makeOrbitsList.php".PHP_EOL);
+
+	if (!file_exists(orbitsAllXml))
+ 			exit("ERROR : NO OrbitsAll.xml FILE !!! Run makeOrbitsList.php and makeOrbitsInKm.php".PHP_EOL);
  
 	if (!file_exists(SimuTargetsXml))
 		exit("ERROR : NO TargetsSimu FILE !!! Run makeProxy.php".PHP_EOL);
  
 	$targetXml = simplexml_load_file(SimuTargetsXml);
 	$orbitsXml = new DomDocument("1.0");
-	$orbitsXml->load(orbitsXml);
+	$orbitsXml->load(orbitsAllXml);
 	$xpath = new DOMXpath($orbitsXml);				
  
 	$targets = $targetXml->Target;
+	$unitsImpex = "km";
  
 	foreach ($targets as $target) 
 	{			
@@ -37,18 +41,17 @@
  
 		// Mecrury double definition
 		if ($coordImpex == "HSM") $coordImpex == "MSM";
-				
+		 
 		// general case 
-		$params = $xpath->query('//orbites[@target="'.$target.'" and @coordinate_system="'.$coordImpex.'"]');	
-		
+		  $params = $xpath->query('//orbites[@target="'.$target.'" and @coordinate_system="'.$coordImpex.'" and @units="'.$unitsImpex.'"]');	
+	 
 		// case of targetImpex = Jupiter.Magnetosphere; targetAmda = Jupiter
 		if ($params->length == 0)
-			$params = $xpath->query('//orbites[@target="'.$targetMain.'" and @coordinate_system="'.$coordImpex.'"]');
-			
+		  	$params = $xpath->query('//orbites[@target="'.$targetMain.'" and @coordinate_system="'.$coordImpex.'" and @units="'.$unitsImpex.'"]');
+	
 		// case of targetImpex = Ganymede; targetAmda = Jupiter.Ganymede
 		if ($params->length == 0)
-			//  $params = $xpath->query('//orbites[contains(@target,"'.$target.')" and @coordinate_system="'.$coordImpex.'"]');
-				$params = $xpath->query('//orbites[contains(@target,"'.$target.'")]');			  
+			 $params = $xpath->query('//orbites[@coordinate_system="'.$coordImpex.'" and @units="'.$unitsImpex.'" and contains(@target,"'.$target.'")]');	
  
 		if ($params->length > 0) 
 		{				 				
@@ -57,7 +60,10 @@
 			$misGrpArr = array();
  
 			foreach ($params as $param)
-			{				  										
+			{		
+			   
+			 //	if ($param->getAttribute('units') != $unitsImpex) continue;
+				
 				$dsId = $param->getAttribute('dataset');	
  
 				if (!is_array($dsArr[$dsId])) $dsArr[$dsId] = array();
@@ -113,7 +113,9 @@ define(&#39;plotsXml&#39;, IHM_SRC_DIR.&#39;public/WebServices/XML/AmdaPlots.xml&#39;); // Web S
  
 // Web Service servers WSDL : $_SERVER['SERVER_NAME'] (par apache)  gethostname() (par command) 
 $SERVER_NAME =  $_SERVER['SERVER_NAME'] ? $_SERVER['SERVER_NAME'] : gethostname();
-define('wsdl_AMDA', "http://".$SERVER_NAME.APACHE_ALIAS."public/wsdl/Methods_AMDA.wsdl"); 
+
+define('webAlias',"http://".$SERVER_NAME.APACHE_ALIAS);
+define('wsdl_AMDA', webAlias."public/wsdl/Methods_AMDA.wsdl");
 /*-------------------END WEB SERVICES section ---------*/
  
 // AKKA - KERNELBIN is now the new kernel bin dir