RemoveVi

Elena.Budnik
1 parent 155b6b3c
Showing 5 changed files with 115 additions and 29 deletions Show diff stats
src/CALLEXT/createVI.php
src/CALLEXT/getData.php
src/DATA/MANAGER/DDBaseMgr.php
src/DATA/MANAGER/RemoveVI.php
src/REMOTEDATA/CDAWEB.php
@@ -32,7 +32,7 @@
 	$verbose = true;
-	$LOGDIR = getenv("DDBASE")."../LOG/");
+	$LOGDIR = getenv("DDBASE")."/../LOG/";
 	if (!is_dir($LOGDIR))
 				mkdir($LOGDIR, 0755, true);
@@ -33,15 +33,23 @@
    putenv("LD_LIBRARY_PATH=".getenv("LD_LIBRARY_PATH"));
 	putenv("PATH=./:".getenv("DDBASEBIN").":/bin:/usr/bin");
 	set_include_path("./:".getenv("DATAMANAGER").":".getenv("REMOTEDATA").":".getenv("CALLEXT"));
+	$verbose = true;
+	
+	$LOGDIR = getenv("DDBASE")."/../LOG/";
+	if (!is_dir($LOGDIR))
+				mkdir($LOGDIR, 0755, true);
+				
+	define("log",$LOGDIR."/getData.log");
+	define("err",$LOGDIR."/getData.err");
 	date_default_timezone_set('UTC');
 	$startStamp = strtotime($Start);
 	$stopStamp = strtotime($Stop);
-	$start = date( "Ymd\THis\Z", $startStamp);
-	$stop = date( "Ymd\THis\Z", $stopStamp);
+	$start = date("Ymd\THis\Z", $startStamp);
+	$stop = date("Ymd\THis\Z", $stopStamp);
-	$startIso = date( "Y-m-d\TH:i:s\.000\Z", $startStamp);
-	$stopIso = date( "Y-m-d\TH:i:s\.000\Z", $stopStamp);
+	$startIso = date("Y-m-d\TH:i:s\.000\Z", $startStamp);
+	$stopIso = date("Y-m-d\TH:i:s\.000\Z", $stopStamp);
 	// Get data and convert to nc
 	$center = new $base();
@@ -115,6 +115,27 @@ class DDBaseMgr
 		 $this->makeAllInLocation();		
 	}
+	public function deleteVi($ViId, $baseId)
+	{
+		$XPath = new DOMXpath($this->DDsysDoc);
+		
+		$dataSet = $XPath->query("//NAME[.='$ViId']");
+		
+		if ($dataSet->item(0)->getAttribute("base") != $baseId)
+			return;
+		
+		$ViToDelete = $dataSet->item(0)->parentNode;	
+		$location = $ViToDelete->getElementsByTagName('LOCATION')->item(0)->nodeValue;
+		
+		$ViToDelete->parentNode->removeChild($ViToDelete);
+         
+		$this->DDsysDoc->save($this->DDsys);
+		system("makeDDsys");
+		
+		foreach (glob($location."/*") as $file) unlink($file);
+		rmdir($location);          
+	}
+	
 	private function makeAllInLocation()
 	{
 		if (!is_dir($this->location)) 
@@ -179,12 +200,7 @@ class DDBaseMgr
 		$this->DDsysDoc->save($this->DDsys);
 		system("makeDDsys");  	
 	}
-	
-	public function deleteVi($ViId, $baseId)
-	{
-	
-	}
-	
+		
 // 	public function getRemoteLocation($base, $remoteVi)
 // 	{
 // 		$XPath = new DOMXpath($this->DDsysDoc);
@@ -0,0 +1,33 @@
+<?php
+
+/**
+*  @file RemoveVI.php
+*  @version $Id: RemoveVI.php 14 2013-09-23 11:23:28Z elena $
+*  @brief DD Server Tools: 
+*  @arg  ViID , [BaseID]
+*/
+	if (!function_exists('__autoload')) 
+	{
+		function __autoload($class_name) {
+				require_once $class_name . '.php';
+		}
+	}
+   
+	putenv("LD_LIBRARY_PATH=".getenv("LD_LIBRARY_PATH"));
+	putenv("PATH=./:".getenv("DDBASEBIN").":/bin:/usr/bin");
+	set_include_path("./:".getenv("DATAMANAGER")); 
+
+   $ViID = strtolower($argv[1]);
+   if ($argc == 3)
+		$BaseID = strtoupper($argv[2]);
+	else 
+		$BaseID = "LOCAL";
+		
+   $baseMgr = new DDBaseMgr();
+   
+   if ($baseMgr->viExists($ViID, $BaseID))
+		$baseMgr->deleteVi($ViID, $BaseID);
+	else 
+		echo "NO $ViID in DDsys.xml".PHP_EOL;
+
+?>
@@ -8,16 +8,16 @@ class CDAWEB extends RemoteDataCenterClass
 {
 	private $ch, $res, $dataViewUR; 
 	private $obsGroupsIds;
-	private $spase_res;
+	private $spase_res, $insXML;
 	private $observatoryGroups, $instrumentTypes;
 	private $CDAWEB = array(), $masterCDF = array();
 	// https://cdaweb.gsfc.nasa.gov/WS/cdasr/1/dataviews/sp_phys/instrumentTypes
-/*	private $validInstrumentTypes = [ "Activity%20Indices", "Electric%20Fields%20(space)","Gamma%20and%20X-Rays",
+	private $validInstrumentTypes = [ "Activity%20Indices", "Electric%20Fields%20(space)","Gamma%20and%20X-Rays",
                                      "Magnetic%20Fields%20(space)", "Particles%20(space)", "Plasma%20and%20Solar%20Wind", 
-                                     "Radio%20and%20Plasma%20Waves%20(space)" ];   */  
-     private $validInstrumentTypes = [  "Magnetic%20Fields%20(space)" ];                               
+                                     "Radio%20and%20Plasma%20Waves%20(space)" ];     
+  //   private $validInstrumentTypes = [  "Magnetic%20Fields%20(space)" ];                               
 //   not used : $validInstrumentTypes = ["Ephemeris"];
@@ -619,8 +619,6 @@ class CDAWEB extends RemoteDataCenterClass
 						// Create datasets nodes
 						foreach ($dss as $ds){	
 							$dsId = $this->baseID.":".$ds;
-// 							$this->domAmda->save('temp.xml');
-// 							$this->domAmda->load('temp.xml');
 							if (!$this->domAmda->getElementById($dsId)){
 								$this->initDDServerXml($ds,$ins,$obs);
 								$dsNode = $this->createDatasetNode($ds);
@@ -636,10 +634,14 @@ class CDAWEB extends RemoteDataCenterClass
 							if (!$insSpaseId ) 
 								$insSpaseId = $ins;
-							$insId = $this->baseID.":".$this->param2dd($groupId).":".$this->param2dd($obs).":".$this->param2dd($insSpaseId);
+							$obsSpaseId = $this->getObservatorySpase();
+							if (!$obsSpaseId ) 
+								$obsSpaseId = $obs;
+							
+							$insId = $this->baseID.":".$this->param2dd($groupId).":".$this->param2dd($obsSpaseId).":".$this->param2dd($insSpaseId);
 							if (!($insNode = $this->domAmda->getElementById($insId))){
-								$insNode = $this->createInstrumentNode($insSpaseId, $obs, $groupId);
+								$insNode = $this->createInstrumentNode($insSpaseId, $obsSpaseId, $groupId);
 								$insNodes[] = $insNode;
 							}
 							foreach ($dsNodes as $dsNode){
@@ -648,10 +650,11 @@ class CDAWEB extends RemoteDataCenterClass
 						}
 					} // foreach ($inss as $ins => $dss)
 					if ($insNodes){
-						$obsId = $this->baseID.":".$this->param2dd($groupId).":".$this->param2dd($obs);
+					
+						$obsId = $this->baseID.":".$this->param2dd($groupId).":".$this->param2dd($obsSpaseId);
 						if (!($obsNode = $this->domAmda->getElementById($obsId))){
-							$obsNode = $this->createObservatoryNode($obs, $groupId);
+							$obsNode = $this->createObservatoryNode($obsSpaseId, $groupId);
 							$obsNodes[] = $obsNode;
 						}
@@ -670,9 +673,21 @@ class CDAWEB extends RemoteDataCenterClass
 				}
 				foreach ($obsNodes as $obsNode){
-					$missionNode->appendChild($obsNode);
+					// observatory == mission
+					if ($obsNode->getAttribute('name') == $missionNode->getAttribute('name')) {
+						$insNodes = $obsNode->getElementsByTagName("instrument");
+						foreach ($insNodes as $insNode)
+							$missionNode->appendChild($insNode);
+					}
+					else 
+						$missionNode->appendChild($obsNode);
 				}
-			}			
+			}	
+			// getElemetByID doesn't work on newly created Document
+			$this->domAmda->save('temp.xml');
+			$this->domAmda->load('temp.xml');
+			
+			$this->dataCenter = $this->domAmda->getElementById($this->baseID);
 		}
 	}
@@ -686,18 +701,19 @@ class CDAWEB extends RemoteDataCenterClass
 	}
 	protected function getInstrumentSpase(){
-		$insXML = new DomDocument("1.0");
+	
+		$this->insXML = new DomDocument("1.0");
 		if ($this->spase_res){
 			$instrument = $this->spase_res->getElementsByTagName('InstrumentID');
 			if ($instrument->length > 0) {
+				
+				curl_setopt($this->ch, CURLOPT_URL, CDAWebConfigClass::$spaseResolver."id=".$instrument->item(0)->nodeValue);
+				
+				$this->insXML->loadXML(curl_exec($this->ch));
+				
 				return $this->getIdFromSpase($instrument->item(0)->nodeValue);
-// 				curl_setopt($this->ch, CURLOPT_URL, CDAWebConfigClass::$spaseResolver."id=".$instrument->item(0)->nodeValue);
-// 
-// 				if (!$insXML->loadXML(curl_exec($this->ch))){
-// 					return null;
-// 				}
 				//InstrumentType
 				//spase://SMWG/Observatory/ACE
 			} 
@@ -706,6 +722,19 @@ class CDAWEB extends RemoteDataCenterClass
 		return null;
 	}
+	protected function getObservatorySpase(){
+		
+		if ($this->insXML){
+			$observatory = $this->insXML->getElementsByTagName('ObservatoryID');
+			
+			if ($observatory->length > 0) {
+				return $this->getIdFromSpase($observatory->item(0)->nodeValue); 			
+			} 
+		}	
+		
+		return null;
+	}
+	
 	protected function setDataCenterAttributes(){}
 	protected function makeArgumentsList(){}
 }