DDServices reorganized

Elena.Budnik
1 parent 1b0e0631
Showing 10 changed files with 44 additions and 275 deletions Show diff stats
CMakeLists.txt
src/DATA/MANAGER/RemoveVI.php
src/DDSERVICES/SOAP/src/Makefile
src/DDSERVICES/SOAP/src/StartStop.c
src/DDSERVICES/TOOLS/CMakeLists.txt
src/DDSERVICES/SOAP/src/GetFileNames.c -> src/DDSERVICES/TOOLS/GetFileNames.c
src/DDSERVICES/SOAP/src/GetInfo.c -> src/DDSERVICES/TOOLS/GetInfo.c
src/DATA/TOOLS/StartStop.c -> src/DDSERVICES/TOOLS/StartStop.c
src/REMOTEDATA/CDAWEB.php
src/REMOTEDATA/RemoteDataCenterClass.php
@@ -49,6 +49,7 @@ add_subdirectory(src/DECODERS/themis/esamom2nc)
 add_subdirectory(src/DECODERS/themis/fgm2nc)
 add_subdirectory(src/DECODERS/themis/sst2nc)
 add_subdirectory(src/DATA/TOOLS)
+add_subdirectory(src/DDSERVICES/TOOLS)
 add_subdirectory(tests)
 install(FILES "scripts/StartServer" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
@@ -58,5 +59,7 @@ install(FILES &quot;scripts/UpdateInfoVI.sh&quot; DESTINATION . PERMISSIONS OWNER_READ OWN
 install(DIRECTORY "src/CALLEXT/" DESTINATION bin/CALLEXT)
 install(DIRECTORY "src/DATA/MANAGER/" DESTINATION bin/DATAMANAGER)
 install(DIRECTORY "src/REMOTEDATA/" DESTINATION bin/REMOTEDATA)
+install(DIRECTORY "src/DDSERVICES/SOAP/" DESTINATION DDService)
+install(DIRECTORY "src/DDSERVICES/REST/" DESTINATION DDService)
 SET(CMAKE_VERBOSE_MAKEFILE ON)
@@ -4,7 +4,7 @@
 *  @file RemoveVI.php
 *  @version $Id: RemoveVI.php 14 2013-09-23 11:23:28Z elena $
 *  @brief DD Server Tools: 
-*  @arg  ViID , [BaseID]
+*  @arg  ViID [ BaseID ]
 */
 	if (!function_exists('__autoload')) 
 	{
@@ -1,30 +0,0 @@
-#-----------------------------------------------------
-#  MAKEFILE for  DD SERVER Services
-#---------------------------------------------------------
-
-EXE = StartStop GetFileNames GetInfo
-
-lib: $(EXE)
-	 
-install:
-	install -d -m a+rx,ug+w ../bin
-	cp $(EXE) ../bin
-		
-clean:	
-	tag="*.o" ${EXE};\
-        for file in $$tag; do \
-	echo $$file; rm -f $$file;\
-	done
-	find -name \*~ -delete
-	
-deinstall:
-	echo "Do nothing"
-
-StartStop: StartStop.c
-	${CC} ${CFLAGS} -o StartStop StartStop.c ${INC} ${LIB} -lnetcdf
-
-GetInfo: GetInfo.c
-	${CC} ${CFLAGS} -o GetInfo GetInfo.c ${INC} ${LIB} -lnetcdf
-
-GetFileNames: GetFileNames.c
-	${CC} ${CFLAGS} -o GetFileNames GetFileNames.c ${INC} ${LIB} -lnetcdf -lDD
@@ -1,104 +0,0 @@
- 
-/** @file  StartStop.c
-*   @brief Stand-alone executable <br> Returns real Start-Stop for VI in DDBase <br>
-*          Is used in DD Server WebServices <br>
-*    @details StartStop(string *, string *)  <br>
-*        @arg \c argv[1] Full name of DDBase reference file  <br>
-*        @arg \c argv[2] Virtual Instrument ID (DD notation) <br>
-*     Output: YYYYDDdayHHMMSSMLS-YYYYDDdayHHMMSSMLS       
-*                 
-*   @date 10.10.2007
-*   @version $Id: StartStop.c,v 1.3 2011/09/05 11:27:34 budnik Exp $
-*/
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
-#include <netcdf.h>
-#include <DD.h>
-
-
-int DataID, RecID, VarID, StartID, StopID;
-size_t RecNum;
-char StartT[TIMELENGTH], StopT[TIMELENGTH], Var[128];
-size_t count[2] = {1L,TIMELENGTH};
-size_t start[2] = {0L,0L};
-size_t countVar[2] = {1L,128L};
-
-/*---------------- NC ERROR --------------------------------------*/
-void nc_handle_error(int status)
-{
-  fprintf(stderr, "%s\n", nc_strerror(status));
-  exit(1);
-}
-
-/* ----------------------- MAIN ------------------------------------*/
-  int main(int argc, char *argv[])
-{
-    
-    int status, len;
- 
-    char Project[50],Instrument[50],Mode[50], RInstrName[100];
-
-
-    if (argc < 3)
-    {
-       fprintf(stderr,"Usage: StartStop reference_file_name DD_VI_ID\n");
-       exit(0);
-    }
-
-     
-    if ((status = nc_open(argv[1], NC_NOWRITE, &DataID)) != NC_NOERR)
-                                            nc_handle_error(status);
-    
-     sscanf(argv[2], "%[^:]%*c%[^:]%*c%[^:]%*c",Project,
-                                                  Instrument,
-                                                   Mode);
-     sprintf(RInstrName,"%s_%s_%s\0",Project,Instrument,Mode);
-
-      if ((status = nc_inq_varid(DataID,RInstrName,&VarID)) != NC_NOERR)
-                                            nc_handle_error(status);
-    
-      start[0] = 1;
-      if((status = nc_get_vara_text(DataID, VarID, start, countVar, Var)) != NC_NOERR)
-                                          nc_handle_error(status);
-       
-       len = strcspn(Var," "); Var[len] = '\0';
-
-       if ((status = nc_close(DataID)) != NC_NOERR) nc_handle_error(status);
-
-// Open VI_times.nc
-      
-       if ((status = nc_open(Var, NC_NOWRITE, &DataID)) != NC_NOERR)
-                                                nc_handle_error(status);
-
-       if ((status = nc_inq_dimid(DataID, "record", &RecID)) != NC_NOERR)
-                                          nc_handle_error(status);
-     
-//   Get Number of Records
-   
-      if ((status = nc_inq_dimlen(DataID, RecID, &RecNum)) != NC_NOERR)
-                                          nc_handle_error(status);
-
-      if ((status = nc_inq_varid(DataID, "StartTime", &StartID)) != NC_NOERR)
-                                          nc_handle_error(status);
-      if ((status = nc_inq_varid(DataID, "StopTime", &StopID)) != NC_NOERR)
-                                          nc_handle_error(status);
-
-// Get The First Start and The Last Stop Times      
-      start[0] = 0;     
-
-     if((status = nc_get_vara_text(DataID, StartID, start, count, StartT)) != NC_NOERR)
-                                          nc_handle_error(status);
-
-      start[0] = RecNum-1; 
-      if((status = nc_get_vara_text(DataID, StopID, start, count, StopT)) != NC_NOERR)
-                                          nc_handle_error(status);
- 
-      printf("%s-%s\n",  StartT, StopT);
-      if ((status = nc_close(DataID)) != NC_NOERR) nc_handle_error(status);
-    
-}
@@ -0,0 +1,20 @@
+
+PROJECT(DDSERVICS_SOAP_TOOLS)
+
+include_directories(
+  ${DDCLIENTINCLUDE_DIR}
+  ${NETCDFINCLUDE_DIR}
+  ${LIBXML2_INCLUDE_DIR}
+)
+
+#Configuration de l'exécutable
+
+file( GLOB SOURCE_FILES ./*.c )
+
+foreach( sourcefile ${SOURCE_FILES} )
+    get_filename_component( source ${sourcefile} NAME)
+    string( REPLACE ".c" "" exefile ${source} )
+    add_executable( ${exefile} ${source} )
+    target_link_libraries( ${exefile}  ${DDCLIENTLIBRARY} ${NETCDFLIBRARY}  ${LIBXML2_LIBRARIES})
+    install (TARGETS ${exefile} DESTINATION bin)
+endforeach( sourcefile ${SOURCE_FILE} ) 
@@ -12,6 +12,7 @@ class CDAWEB extends RemoteDataCenterClass
 	private $observatoryGroups, $instrumentTypes;
 	private $CDAWEB = array(), $masterCDF = array();
+	private $header;
 	// https://cdaweb.gsfc.nasa.gov/WS/cdasr/1/dataviews/sp_phys/instrumentTypes
 	private $validInstrumentTypes = [ "Activity%20Indices", "Electric%20Fields%20(space)","Gamma%20and%20X-Rays",
@@ -38,7 +39,10 @@ class CDAWEB extends RemoteDataCenterClass
 	}
 	public function init() 	
-	{		   							
+	{	
+		
+		error_log("CDAWEB Proxy creation on ".date("Y-m-d").PHP_EOL,3,log);
+		
 		$this->getAllSpaseDatasets();		
 	}			 
@@ -127,10 +131,7 @@ class CDAWEB extends RemoteDataCenterClass
 				$this->obsGroupsIds[$insType][$obsGroupId] = $obsIds;
 			}
-		}	
-		
-	//	print_r($this->obsGroupsIds);
-	//	$this->closeConnection();		
+		}		
 	}
 	protected function getDatasetByObservatoryAndInstrument($obsGroupId,  $obsId, $insId)
@@ -139,19 +140,22 @@ class CDAWEB extends RemoteDataCenterClass
 		$grpEncodedId = $this->html_encode($obsGroupId);
 		$insEncodedId = $this->html_encode($insId);
+		$obsEncodedId = $this->html_encode($obsId);
 		$res = new DomDocument("1.0");
-		curl_setopt($this->ch, CURLOPT_URL, $this->dataViewURL."/datasets?observatoryGroup=$grpEncodedId&instrument=$insEncodedId");	
+	//	curl_setopt($this->ch, CURLOPT_URL, $this->dataViewURL."/datasets?observatoryGroup=$grpEncodedId&instrument=$insEncodedId");
+	
+		curl_setopt($this->ch, CURLOPT_URL, $this->dataViewURL."/datasets?observatory=$obsEncodedId&instrument=$insEncodedId");
 		$res->loadXML(curl_exec($this->ch));
-// 		$this->res->save('dataset.xml');
-// 		exit();
+exit ($res->saveXML());
+
 		$datasets = $res->getElementsByTagName('DatasetDescription');
 		$dsIds = array();
 		foreach ( $datasets as $ds)
 		{
-			$obs = $ds->getElementsByTagName('Observatory')->item(0)->nodeValue;
+		//	$obs = $ds->getElementsByTagName('Observatory')->item(0)->nodeValue;
 			if ($obs != $obsId ) continue;
 			$dsIds[] = $ds->getElementsByTagName('Id')->item(0)->nodeValue;
 		}
@@ -159,132 +163,6 @@ class CDAWEB extends RemoteDataCenterClass
 		return $dsIds;  
 	}
-	protected function createMissionNodes()
-	{
-	   $missionNodes = array();
-	   $missionIds = array();
-	   // unique values
-	   // $this->obsGroupsIds = array_map("unserialize", array_unique(array_map("serialize", $this->obsGroupsIds)));
-	   
-		foreach ($this->obsGroupsIds as $groupId => $insTypes)
-		{
-			// echo '  GroupID '.$groupId.PHP_EOL;
-			$missionId = $this->baseID.":".$this->param2dd($groupId);
-			
-			if (!in_array($missionId, $missionIds))
-			{
-				$missionNode = $this->domAmda->createElement('mission');
-				$missionNode->setAttribute("xml:id",$missionId);
-				$missionNode->setAttribute("name",$groupId);
-				
-				$missionIds[] = $missionId;
-				$newNode = true;
-			}
-			else {
-				$key = array_search($missionId, $missionIds);
-				$missionNode = $missionNodes[$key];	
-				$newNode = false;
-			}
-			
-			foreach ($insTypes as $insType => $obss){
-				// echo $insType.PHP_EOL;
-				
-				foreach ( $obss as $obs => $inss){
-					// echo $obs.PHP_EOL;
-					// OMNI ONLY ONCE
-					if (substr($obs,0,4) == "OMNI" && substr($missionId,0,4) != "OMNI"){
-						//echo '       '.$obs.' '.$missionId.PHP_EOL;
-						continue;
-					}
-					
-					if (file_exists(RemoteData."/".CDAWebConfigClass::$mapXML)) {
-						$obsAMDA = $this->alias(RemoteData."/".CDAWebConfigClass::$mapXML, $obs);
-					}
-					else {
-						$obsAMDA = $obs;
-					}
-					
-					$obsId = $this->baseID.":".$this->param2dd($groupId).":".$this->param2dd($obsAMDA);
-					$obsNodes = $missionNode->getElementsByTagName('observatory');
-					$newObsNode = true;
-					
-					foreach ($obsNodes as $node){
-						$id = $node->getAttribute("xml:id");
-						
-						if ($id == $obsId) {
-							$obsNode = $node;
-							$newObsNode = false;							
-							break;
-						}
-					}
-					
-					if ( $newObsNode ){
-						$obsNode = $this->createObservatoryNode($obs, $groupId);						
-					}
-					
-					foreach ($inss as $ins => $dss){
-						$insId = $this->baseID.":".$this->param2dd($groupId).":".$this->param2dd($obs).":".$this->param2dd($ins);
-						$insNodes = $obsNode->getElementsByTagName('instrument');
-						$newInsNode = true;
-						
-						foreach ($insNodes as $node){
-							$id = $node->getAttribute("xml:id");
-							
-							if ($id == $insId) {
-								$insNode = $node;
-								$newInsNode = false;
-								break;
-							}
-						}
-						
-						if ( $newInsNode )					
-							$insNode = $this->createInstrumentNode($ins, $obs, $groupId);							
-						 
-						foreach ($dss as $ds){	
-							$dsId = $this->baseID.":".$ds;
-							$dsNodes = $insNode->getElementsByTagName('dataset');
-						   $newDsNode = true;
-						   
-							foreach ($dsNodes as $node){
-								$id = $node->getAttribute("xml:id");
-								
-								if ($id == $dsId){
-									$dsNode = $node;
-									$newDsNode = false;
-									break;
-								}
-							}
-							
-							if ($newDsNode) {
-								$this->initDDServerXml($ds,$ins,$obs);
-								
-								$dsNode =  $this->createDatasetNode($ds);
-								if ($dsNode){
-									$insNode->appendChild($dsNode);
-									$this->saveDDServerXml();
-								}
-							}
-						}
-						
-						if ($newInsNode && $insNode->hasChildNodes())
-							$obsNode->appendChild($insNode);
-					}	
-					
-					if ($newObsNode && $obsNode->hasChildNodes()){				  
-						$missionNode->appendChild($obsNode);
-					}
-				}				
-				
-			}
-			
-			if ($newNode) 
-				$missionNodes[] = $missionNode;
-		}
-			 
-		return $missionNodes;
-		
-	}
-	
 	protected function createObservatoryNode($id, $grpId)
 	{	
@@ -447,7 +325,7 @@ class CDAWEB extends RemoteDataCenterClass
 		   $this->CDAWEB[$key[0]->innertext] = $ref[0]->innertext;		   
 		}
-		echo "SPASE-defined CDAWEB datasets : ".count($this->CDAWEB).PHP_EOL;		
+		echo "SPASE-defined CDAWEB datasets : ".count($this->CDAWEB).PHP_EOL;
 	}
 	protected function initDDServerXml($ds, $ins, $obs)
@@ -706,6 +584,8 @@ class CDAWEB extends RemoteDataCenterClass
 			}
 			$first = false;
 		}
+		
+		$this->closeConnection();
 	}
 	protected function createMissionNode($groupId){
@@ -754,6 +634,7 @@ class CDAWEB extends RemoteDataCenterClass
 	protected function setDataCenterAttributes(){}
 	protected function makeArgumentsList(){}
+
 } 
 ?>
@@ -62,7 +62,6 @@ abstract class RemoteDataCenterClass
 	abstract public function init(); 
 	abstract protected function getRemoteTree();
 	abstract protected function setDataCenterAttributes();
-	abstract protected function createMissionNodes();
 	abstract protected function makeArgumentsList();
 //	abstract public function getDatasetInfo($ds);	
 //	abstract public function getData($ds, $start, $stop);
@@ -110,11 +109,11 @@ abstract class RemoteDataCenterClass
 		foreach ($missionNodes as $missionNode)
 			$this->dataCenter->appendChild($missionNode);
 	}
-	
+
 	protected function getIdFromSpase($spaseId) 
 	{
-		$temp = explode('/',$spaseId);
-		return $temp[count($temp)-1]; 
+			$temp = explode('/',$spaseId);
+			return $temp[count($temp)-1]; 
 	}
 	public function monitor()