Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/DDServer

Myriam Bouchemit
2 parents fa328fd7 a5ec00c9
Showing 45 changed files with 1855 additions and 40 deletions Show diff stats
CMakeLists.txt
CMakeLists.txt.All
CMakeLists.txt.DDServerOnly
CMakeLists.txt.ServicesOnly
compilAndInstall.sh
info/DDADMIN/AddUser.json
info/DDADMIN/AddVi.json
src/REMOTEDATA/Bases.xml -> info/REMOTEDATA/Bases.xml
src/REMOTEDATA/ThemisTreeTemplate.xml -> info/REMOTEDATA/ThemisTreeTemplate.xml
info/REMOTEDATA/mapCDAWEB.xml
scripts/AddUser.sh
scripts/AddUserGroups.sh
scripts/CleanRemote.sh
scripts/DDServer.env.in
scripts/DeleteUser.sh
scripts/SyncManunjaFromCdpp3.sh
src/DATA/MANAGER/CleanRemote.php
src/DATA/MANAGER/DDBaseMgr.php
src/DATA/TOOLS/ClearTimes.c -> src/DATA/TOOLS/DDClearTimes.c
src/DDADMIN/MANAGER/UserManager.php
@@ -68,23 +68,25 @@ add_subdirectory(src/DECODERS/nc2nc)
 add_subdirectory(src/DECODERS/themis)
 add_subdirectory(src/DATA/TOOLS)
 add_subdirectory(src/DDSERVICES/TOOLS)
+add_subdirectory(src/DDADMIN/TOOLS)
 add_subdirectory(tests)
  
 install(FILES "scripts/StartServer" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(FILES "scripts/DDServer.env" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(FILES "scripts/AddLocalVI.sh" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(FILES "scripts/UpdateInfoVI.sh" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(FILES "scripts/RemoveVI.sh" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(FILES "scripts/MakeRemoteProxy.sh" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+file(GLOB scripts "scripts/*.sh")
+install(FILES ${scripts} DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
  
 install(DIRECTORY "src/CALLEXT/" DESTINATION bin/CALLEXT)
 install(DIRECTORY "src/DATA/MANAGER/" DESTINATION bin/DATAMANAGER)
 install(DIRECTORY "src/DATA/TEMPLATES/" DESTINATION bin)
 install(DIRECTORY "src/REMOTEDATA/" DESTINATION bin/REMOTEDATA)
+install(DIRECTORY "src/DDADMIN/MANAGER/" DESTINATION bin/USERMANAGER)
 install(DIRECTORY "src/DDSERVICES/SOAP/" DESTINATION DDService)
 install(DIRECTORY "src/DDSERVICES/REST/" DESTINATION DDService)
  
 install(FILES "src/DECODERS/cdf2nc/cdf_to_netcdf_mapping.dat" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE  GROUP_READ  WORLD_READ) 
-install(FILES "src/REMOTEDATA/Bases.xml" DESTINATION ${DDBASEINFO} PERMISSIONS OWNER_READ OWNER_WRITE  GROUP_READ WORLD_READ)
+
+file(GLOB config_files "info/REMOTEDATA/*.xml")
+install(FILES ${config_files} DESTINATION ${DDBASEINFO} PERMISSIONS OWNER_READ OWNER_WRITE  GROUP_READ WORLD_READ)
  
 SET(CMAKE_VERBOSE_MAKEFILE ON)
@@ -0,0 +1,92 @@
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(DDServer)
+
+add_definitions( -DLINUX )
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/)
+
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+  #64 bits
+  MESSAGE( STATUS "64 bits" )
+  set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread")
+  set(CMAKE_C_FLAGS_RELEASE "-DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread")
+  set(USRLIB_DIR "/usr/lib64/:/usr/local/lib64/")
+else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+  #32 bits
+  MESSAGE( STATUS "32 bits" )
+  set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread")
+  set(CMAKE_C_FLAGS_DEBUG "-DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread")
+  set(USRLIB_DIR "/usr/lib/:/usr/local/lib/")
+endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+
+set (USERLOCAL_ROOT "/usr/local/lib/")
+if (EXISTS "$ENV{USERLOCAL_ROOT}")
+    set(USERLOCAL_ROOT "$ENV{USERLOCAL_ROOT}")
+    message("USERLOCAL_ROOT forced to ${USERLOCAL_ROOT}")
+endif()
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
+
+find_package( Threads REQUIRED )
+find_package( CRYPT REQUIRED )
+find_package( NetCDF REQUIRED )
+find_package( DDClient REQUIRED )
+find_package( CDF REQUIRED )
+find_package( LibXML2 REQUIRED ) 
+
+get_filename_component(NETCDFLIB_DIR ${NETCDFLIBRARIES} PATH)
+get_filename_component(DDCLIENTLIB_DIR ${DDCLIENTLIBRARIES} PATH)
+set(DDSERVICE_URL $ENV{DDSERVICE_URL})
+set(DDRESPATH $ENV{DDRESPATH})
+set(DDBASEDATA "$ENV{DDBASEPATH}/DATA")
+set(DDBASEINFO "$ENV{DDBASEPATH}/INFO")
+set(PROXY_HOST $ENV{PROXY_HOST})
+set(PROXY_USERPWD $ENV{PROXY_USERPWD})
+
+configure_file (
+ "${CMAKE_SOURCE_DIR}/scripts/DDServer.env.in"
+ "${CMAKE_SOURCE_DIR}/scripts/DDServer.env"
+)
+
+configure_file (
+ "${CMAKE_SOURCE_DIR}/src/DDSERVICES/SOAP/DDserverWeb_ini.php.in"
+ "${CMAKE_SOURCE_DIR}/src/DDSERVICES/SOAP/DDserverWeb_ini.php"
+)
+
+configure_file (
+ "${CMAKE_SOURCE_DIR}/src/DDSERVICES/SOAP/dd.wsdl.in"
+ "${CMAKE_SOURCE_DIR}/src/DDSERVICES/SOAP/dd.wsdl"
+)
+
+MESSAGE( STATUS "Build DD_Server Project" )
+add_subdirectory(src/SERVER)
+add_subdirectory(src/DECODERS/ascii2nc)
+add_subdirectory(src/DECODERS/cdf2nc)
+add_subdirectory(src/DECODERS/cdfnew2nc)
+add_subdirectory(src/DECODERS/nc2nc)
+add_subdirectory(src/DECODERS/themis)
+add_subdirectory(src/DATA/TOOLS)
+add_subdirectory(src/DDSERVICES/TOOLS)
+add_subdirectory(src/DDADMIN/TOOLS)
+add_subdirectory(tests)
+
+install(FILES "scripts/StartServer" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(FILES "scripts/DDServer.env" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+file(GLOB scripts "scripts/*.sh")
+install(FILES ${scripts} DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+install(DIRECTORY "src/CALLEXT/" DESTINATION bin/CALLEXT)
+install(DIRECTORY "src/DATA/MANAGER/" DESTINATION bin/DATAMANAGER)
+install(DIRECTORY "src/DATA/TEMPLATES/" DESTINATION bin)
+install(DIRECTORY "src/REMOTEDATA/" DESTINATION bin/REMOTEDATA)
+install(DIRECTORY "src/DDADMIN/MANAGER/" DESTINATION bin/USERMANAGER)
+install(DIRECTORY "src/DDSERVICES/SOAP/" DESTINATION DDService)
+install(DIRECTORY "src/DDSERVICES/REST/" DESTINATION DDService)
+
+install(FILES "src/DECODERS/cdf2nc/cdf_to_netcdf_mapping.dat" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE  GROUP_READ  WORLD_READ) 
+
+file(GLOB config_files "info/REMOTEDATA/*.xml")
+install(FILES ${config_files} DESTINATION ${DDBASEINFO} PERMISSIONS OWNER_READ OWNER_WRITE  GROUP_READ WORLD_READ)
+
+SET(CMAKE_VERBOSE_MAKEFILE ON)
@@ -0,0 +1,56 @@
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(DDServer)
+
+add_definitions( -DLINUX )
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/)
+
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+  #64 bits
+  MESSAGE( STATUS "64 bits" )
+  set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread")
+  set(CMAKE_C_FLAGS_RELEASE "-DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread")
+  set(USRLIB_DIR "/usr/lib64/:/usr/local/lib64/")
+else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+  #32 bits
+  MESSAGE( STATUS "32 bits" )
+  set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread")
+  set(CMAKE_C_FLAGS_DEBUG "-DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread")
+  set(USRLIB_DIR "/usr/lib/:/usr/local/lib/")
+endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+
+set (USERLOCAL_ROOT "/usr/local/lib/")
+if (EXISTS "$ENV{USERLOCAL_ROOT}")
+    set(USERLOCAL_ROOT "$ENV{USERLOCAL_ROOT}")
+    message("USERLOCAL_ROOT forced to ${USERLOCAL_ROOT}")
+endif()
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
+
+find_package( Threads REQUIRED )
+find_package( CRYPT REQUIRED )
+find_package( NetCDF REQUIRED )
+find_package( DDClient REQUIRED )
+
+get_filename_component(NETCDFLIB_DIR ${NETCDFLIBRARIES} PATH)
+get_filename_component(DDCLIENTLIB_DIR ${DDCLIENTLIBRARIES} PATH)
+set(DDRESPATH $ENV{DDRESPATH})
+set(DDBASEDATA "$ENV{DDBASEPATH}/DATA")
+set(DDBASEINFO "$ENV{DDBASEPATH}/INFO")
+set(PROXY_HOST $ENV{PROXY_HOST})
+set(PROXY_USERPWD $ENV{PROXY_USERPWD})
+
+configure_file (
+ "${CMAKE_SOURCE_DIR}/scripts/DDServer.env.in"
+ "${CMAKE_SOURCE_DIR}/scripts/DDServer.env"
+)
+
+MESSAGE( STATUS "Build DD_Server ONLY from DD Server Project" )
+add_subdirectory(src/SERVER)
+
+install(FILES "scripts/StartServer" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(FILES "scripts/DDServer.env" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+
+SET(CMAKE_VERBOSE_MAKEFILE ON)
@@ -0,0 +1,92 @@
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(DDServer)
+
+add_definitions( -DLINUX )
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/)
+
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+  #64 bits
+  MESSAGE( STATUS "64 bits" )
+  set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread")
+  set(CMAKE_C_FLAGS_RELEASE "-DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread")
+  set(USRLIB_DIR "/usr/lib64/:/usr/local/lib64/")
+else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+  #32 bits
+  MESSAGE( STATUS "32 bits" )
+  set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread")
+  set(CMAKE_C_FLAGS_DEBUG "-DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread")
+  set(USRLIB_DIR "/usr/lib/:/usr/local/lib/")
+endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+
+set (USERLOCAL_ROOT "/usr/local/lib/")
+if (EXISTS "$ENV{USERLOCAL_ROOT}")
+    set(USERLOCAL_ROOT "$ENV{USERLOCAL_ROOT}")
+    message("USERLOCAL_ROOT forced to ${USERLOCAL_ROOT}")
+endif()
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
+
+find_package( Threads REQUIRED )
+find_package( CRYPT REQUIRED )
+find_package( NetCDF REQUIRED )
+find_package( DDClient REQUIRED )
+find_package( CDF REQUIRED )
+find_package( LibXML2 REQUIRED ) 
+
+get_filename_component(NETCDFLIB_DIR ${NETCDFLIBRARIES} PATH)
+get_filename_component(DDCLIENTLIB_DIR ${DDCLIENTLIBRARIES} PATH)
+set(DDSERVICE_URL $ENV{DDSERVICE_URL})
+set(DDRESPATH $ENV{DDRESPATH})
+set(DDBASEDATA "$ENV{DDBASEPATH}/DATA")
+set(DDBASEINFO "$ENV{DDBASEPATH}/INFO")
+set(PROXY_HOST $ENV{PROXY_HOST})
+set(PROXY_USERPWD $ENV{PROXY_USERPWD})
+
+configure_file (
+ "${CMAKE_SOURCE_DIR}/scripts/DDServer.env.in"
+ "${CMAKE_SOURCE_DIR}/scripts/DDServer.env"
+)
+
+configure_file (
+ "${CMAKE_SOURCE_DIR}/src/DDSERVICES/SOAP/DDserverWeb_ini.php.in"
+ "${CMAKE_SOURCE_DIR}/src/DDSERVICES/SOAP/DDserverWeb_ini.php"
+)
+
+configure_file (
+ "${CMAKE_SOURCE_DIR}/src/DDSERVICES/SOAP/dd.wsdl.in"
+ "${CMAKE_SOURCE_DIR}/src/DDSERVICES/SOAP/dd.wsdl"
+)
+
+MESSAGE( STATUS "Build DD_Server Project" )
+# add_subdirectory(src/SERVER)
+# add_subdirectory(src/DECODERS/ascii2nc)
+# add_subdirectory(src/DECODERS/cdf2nc)
+# add_subdirectory(src/DECODERS/cdfnew2nc)
+# add_subdirectory(src/DECODERS/nc2nc)
+# add_subdirectory(src/DECODERS/themis)
+# add_subdirectory(src/DATA/TOOLS)
+# add_subdirectory(src/DDSERVICES/TOOLS)
+# add_subdirectory(src/DDADMIN/TOOLS)
+# add_subdirectory(tests)
+# 
+# install(FILES "scripts/StartServer" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+# install(FILES "scripts/DDServer.env" DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+# file(GLOB scripts "scripts/*.sh")
+# install(FILES ${scripts} DESTINATION . PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+# 
+# install(DIRECTORY "src/CALLEXT/" DESTINATION bin/CALLEXT)
+# install(DIRECTORY "src/DATA/MANAGER/" DESTINATION bin/DATAMANAGER)
+# install(DIRECTORY "src/DATA/TEMPLATES/" DESTINATION bin)
+# install(DIRECTORY "src/REMOTEDATA/" DESTINATION bin/REMOTEDATA)
+# install(DIRECTORY "src/DDADMIN/MANAGER/" DESTINATION bin/USERMANAGER)
+install(DIRECTORY "src/DDSERVICES/SOAP/" DESTINATION DDService)
+install(DIRECTORY "src/DDSERVICES/REST/" DESTINATION DDService)
+
+# install(FILES "src/DECODERS/cdf2nc/cdf_to_netcdf_mapping.dat" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE  GROUP_READ  WORLD_READ) 
+# 
+# file(GLOB config_files "info/REMOTEDATA/*.xml")
+# install(FILES ${config_files} DESTINATION ${DDBASEINFO} PERMISSIONS OWNER_READ OWNER_WRITE  GROUP_READ WORLD_READ)
+
+SET(CMAKE_VERBOSE_MAKEFILE ON)
@@ -5,7 +5,7 @@ usage=&quot;
     \n
     \n    Usage : $0 -d <Destination path> -u <DDService URL> -r <DD.res directory path> -b <DDBASE path> [-l <User local directory. By default, it's /usr/local>] [-p <Proxy host:port>] [-a <Proxy user name:password for authentication>]
     \n
-    \n            $0 -d /opt/tools/DDServer -u http://amdadev.fr/DDService -r /var/amda-data/ -b /var/amda-data/DDBASE -l /opt/local -h 'myproxy.fr:9090' -p 'username:userpwd'
+    \n            $0 -d /opt/tools/DDServer -u http://amdadev.fr/DDService -r /var/amda-data/ -b /var/amda-data/DDBASE -l /opt/local -p 'myproxy.fr:9090' -a 'username:userpwd'
     \n
     \n
     \n ###"
@@ -0,0 +1,10 @@
+{ "action"     : "add",
+  "pwd_hashed" : false,
+  "news"       : true,
+  "sendEmail"  : false,
+  "login"      : "test",
+  "pwd"        : "testpass",
+  "first_name" : "Huang",
+  "last_name"  : "Shiyong",
+  "email"      : "ebudnik@irap.omp.eu",
+  "groups"     : "" }
@@ -0,0 +1,9 @@
+{ "brief"             : "jedi",
+  "ViId"              : "juno_jedi_i180",
+  "mission"           : "JUNO",
+  "instrument"        : "JEDI",
+  "mission_dir"       : "JUNO/",
+  "location"          : "JEDI/I_180",
+  "min_sampling"      : "2",
+  "max_sampling"      : "3" }
+  
 \ No newline at end of file
 <?xml version="1.0"?>
 <dataRoot xml:id="myRemoteData-treeRootNode">
-	<dataCenter name="CDAWeb" desc="Coordinated_Data_Analysis" id1="CDAWEB" xml:id="CDAWEB"/>
+	<dataCenter name="CDAWeb" desc="Coordinated_Data_Analysis" addable="true" id1="CDAWEB" xml:id="CDAWEB"/>
 	<!--<dataCenter name="MAPSKP@IRAP" desc="Cassini MAPS_Key_Parameters" group="" default="yes" id1="MAPSKP" xml:id="MAPSKP"/>-->
 	<dataCenter name="THEMIS" desc="Mirror_IRAP_Data_Base"  default="yes" id1="THEMIS" xml:id="THEMIS"/>
 </dataRoot>
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<ALIASES> 
+    <observatory xml:id='AC'>ACE</observatory>
+    <observatory xml:id='EQ'>EQUATOR-S</observatory>
+    <observatory xml:id="IMP-8">IMP8</observatory>
+    <observatory xml:id="I8">IMP8</observatory>
+    <observatory xml:id="G0">GOES_10</observatory>
+    <observatory xml:id="G10">GOES_10</observatory>
+    <observatory xml:id="G11">GOES_11</observatory>
+    <observatory xml:id="G12">GOES_12</observatory>
+    <observatory xml:id="CT">CL</observatory>
+    <observatory xml:id="PO">POLAR</observatory>
+    <observatory xml:id="IM">IMAGE</observatory>
+    <observatory xml:id="AHEAD">STA</observatory>
+    <observatory xml:id="BEHIND">STB</observatory>
+    <observatory xml:id="STEREOA">STA</observatory>
+    <observatory xml:id="STEREOB">STB</observatory>
+    <observatory xml:id="CRRES_SATELLITE">CRRES</observatory>
+    <observatory xml:id="RBSP-A-RBSPICE">RBSP-A</observatory>
+    <observatory xml:id="RBSP-B-RBSPICE">RBSP-B</observatory>
+    <observatory xml:id="RBSPA">RBSP-A</observatory>
+    <observatory xml:id="RBSPB">RBSP-B</observatory>
+    <instrument xml:id="SWI">SWICS</instrument>
+    <instrument xml:id="ULE">ULEIS</instrument>
+    <instrument xml:id='SEP'>SEPICA</instrument> 
+    <instrument xml:id="FGM_SPIN">FGM</instrument>
+    <instrument xml:id="ECT-HOPE-SCI-L2">ECT</instrument>
+    <instrument xml:id="ECT-REPT-SCI-L2">ECT</instrument> 
+    <instrument xml:id="ECT-MAGEIS-L2">ECT</instrument>
+    <instrument xml:id="MAGNETOMETER">EMFISIS</instrument>
+    <instrument xml:id="EMFISIS-L2">EMFISIS</instrument>  
+    <instrument xml:id="EMFISIS-L3">EMFISIS</instrument>
+    <instrument xml:id="LEV-2">RBSPICE</instrument>    
+    <instrument xml:id="EFW-L2">EFW</instrument>  
+    <instrument xml:id="HFR-WAVEFORM">EMFISIS</instrument>
+    <instrument xml:id="WFR-WAVEFORM-CONTINUOUS-BURST">EMFISIS</instrument>
+    <instrument xml:id="SEPT>STEREO-A IMPACT/SEPT">SEPT</instrument>
+    <instrument xml:id="SEPT>STEREO-B IMPACT/SEPT">SEPT</instrument>
+    <instrument xml:id="SIT>STEREO-A IMPACT/SIT">SIT</instrument>
+    <instrument xml:id="SIT>STEREO-B IMPACT/SIT">SIT</instrument>
+    <instrument xml:id="LET>STEREO-A IMPACT/LET">LET</instrument>
+    <instrument xml:id="LET>STEREO-B IMPACT/LET">LET</instrument>
+    <instrument xml:id="STE>STEREO-A IMPACT/STE">STE</instrument>
+    <instrument xml:id="STE>STEREO-B IMPACT/STE">STE</instrument>
+    <instrument xml:id="SWEA_DISB>STEREO-A IMPACT/SWEA">SWEA</instrument> 
+    <instrument xml:id="SWEA_DISB>STEREO-B IMPACT/SWEA">SWEA</instrument> 
+    <instrument xml:id="SWEA_DIST>STEREO-A IMPACT/SWEA">SWEA</instrument> 
+    <instrument xml:id="SWEA_DIST>STEREO-B IMPACT/SWEA">SWEA</instrument> 
+</ALIASES>
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+if [ $# -eq 0 ]
+	then
+		echo "json input be defined"
+		exit
+	fi
+	
+while getopts "j:" options; do
+    case $options in
+        j ) JSON_FILE=`echo $OPTARG`;;
+    esac
+done
+
+BASEDIR=$(dirname "$0")
+
+. ${BASEDIR}/DDServer.env
+	php ${USERMANAGER}/UserManager.php --json $JSON_FILE
+	
+ 
+
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ $# -le 1 ]
+	then
+		echo "user and group[s] should be defined"
+		exit
+	fi
+
+BASEDIR=$(dirname "$0")
+
+. ${BASEDIR}/DDServer.env
+ 
+	php ${USERMANAGER}/UserManager.php "groups" $1 $2
+	
+ 
+
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+BASEDIR=$(dirname "$0")
+
+. ${BASEDIR}/DDServer.env
+
+php ${DATAMANAGER}/CleanRemote.php
+
+ 
+
 #!/bin/bash
  
 DDBASE=@DDBASEDATA@
+DDINFO=@DDBASEINFO@
 DDPATH=@DDRESPATH@
 DDLIB=@DDCLIENTLIB_DIR@/
 DDBASEBIN=@CMAKE_INSTALL_PREFIX@/bin
@@ -8,9 +9,12 @@ LD_LIBRARY_PATH=$DDLIB/:@NETCDFLIB_DIR@:@libcdf_LIBRARY_DIR@:@USRLIB_DIR@
 DATAMANAGER=@CMAKE_INSTALL_PREFIX@/bin/DATAMANAGER
 REMOTEDATA=@CMAKE_INSTALL_PREFIX@/bin/REMOTEDATA
 CALLEXT=@CMAKE_INSTALL_PREFIX@/bin/CALLEXT
+USERMANAGER=@CMAKE_INSTALL_PREFIX@/bin/USERMANAGER
 PROXY_HOST="@PROXY_HOST@"
 PROXY_USERPWD="@PROXY_USERPWD@"
  
-export DDBASE DDPATH DDBASEBIN DDLIB LD_LIBRARY_PATH
-export DATAMANAGER REMOTEDATA CALLEXT
+export DDBASE DDPATH DDBASEBIN DDLIB LD_LIBRARY_PATH DDINFO
+export DATAMANAGER REMOTEDATA CALLEXT USERMANAGER
 export PROXY_HOST PROXY_USERPWD
+export AMDA_USERS_INFO=AMDA_Users_Info.xml
+export AMDA_GROUPS_INFO=AMDA_Users.xml
 \ No newline at end of file
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ $# -eq 0 ]
+	then
+		echo "user should be defined"
+		exit
+	fi
+
+BASEDIR=$(dirname "$0")
+
+. ${BASEDIR}/DDServer.env
+ 
+	php ${USERMANAGER}/UserManager.php "delete" $1
+	
+ 
+
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# run at manunja
+# MISSIONS_LIST example
+# ACE
+# GRD/AE
+
+export DDBASE=/data/DDBASE/DATA
+export remote=cdpp3.irap.omp.eu
+export DDLIB=/home/budnik/AMDANEW/DDLIB/lib
+export DECODERTOOLS=/home/budnik/depotDECODER/TOOLS
+
+MISSIONS=${DDBASE}/../MISSIONS_LIST_CDPP3
+
+if [ -f ${MISSIONS} ]; then
+    while read Mission 
+    do
+        # if empty line - continue
+        [ -z "$Mission" ] && continue
+
+        for Dir in $(find -L $DDBASE/$Mission*  -maxdepth 4 -type d -links 2) 
+        do 
+   
+            remoteDir="${Dir/data/data1}"
+            sshpass -p "xxx" rsync -auvr budnik@${remote}:${remoteDir}/*nc.gz ${Dir}
+            sshpass -p "xxx" rsync -vu  budnik@${remote}:${remoteDir}/*times.nc ${Dir}
+            sshpass -p "xxx" rsync -vu  budnik@${remote}:${remoteDir}/*info* ${Dir}
+        #    sshpass -p "xxx" rsync -vu budnik@${remote}:${remoteDir}/Vesrion ${Dir} 
+        #    sshpass -p "xxx" rsync -vu budnik@${remote}:${remoteDir}/*Stop ${Dir}
+
+            cd ${Dir}          
+            ls | xargs chown -R budnik:dd ${Dir}
+            ls | xargs chmod -R ug+w ${Dir} 
+            ./clean
+            cd ${DDBASE}/..
+            
+            php ${DECODERTOOLS}/DataBaseLog/updateDataBaseLog.php ${Dir} budnik fromCDPP3
+
+         #   echo ${Dir} `date +"%Y-%m-%d"` >> sync.log
+        done
+    done <${MISSIONS}
+ fi
@@ -0,0 +1,21 @@
+<?php
+
+/**
+*  @file CleanRemote.php
+*  @brief DD Server Tools: 
+*/
+	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")); 
+
+   $baseMgr = new DDBaseMgr();
+   $baseMgr->cleanRemote();
+ 
+?>
@@ -290,6 +290,75 @@ class DDBaseMgr
 		system("infoLocal2nc ".$this->info_xml." ".$this->info);
 		chdir($currDir);
 	}
+	
+	public function cleanRemote($opt = NULL)
+	{
+		$res_before = disk_free_space(getenv("DDBASE"));
+		$Days = 10;  // default
+		$SecDay = 3600*24;
+		$nodata = false;
+
+		if (isset($opt)) {
+			if ($opt == "NODATA") 
+					$nodata = true;
+			else {
+				$Days = is_numeric($opt) ? $opt : 10;
+				settype($Days, "int");
+				echo "!!!!!!!!!!!!!!!! Days   ".$Days.PHP_EOL;
+			}
+		}
+		
+		$GlobalDelta = $Days*$SecDay;
+	
+		$xp = new domxpath($this->DDsysDoc);
+		$dataSets = $xp->query("//NAME[attribute::base!='LOCAL']");
+		
+		for ($i = 0; $i < $dataSets->length; $i++) 
+		{ 
+			$parent = $dataSets->item($i)->parentNode;
+			$location = $parent->getElementsByTagName("LOCATION")->item(0)->nodeValue;
+ 
+			if (!is_dir($location)) {
+				$parent->parentNode->removeChild($parent);
+			}
+			else {
+				$time_info = $parent->getElementsByTagName("TIMES")->item(0)->nodeValue;
+				chdir($location);
+				system("./clean");
+				touch($location."/LOCK");
+
+				fprintf(STDERR,"In the ".$location."\n");
+
+				/*  Delete No Data Intervals */        
+				if ($nodata) {
+					system("CleanNoData ".$time_info); 
+				}
+				/*  Delete Old Files */  
+				else {
+					foreach (glob("*.gz") as $filename) {
+						$info = stat($filename);
+						if ((time() - $info['atime']) > $GlobalDelta) {
+							//fprintf(STDERR, $filename."\n");
+							system("TimesUpdate -d ".$time_info." ".$filename);
+						}
+						//fprintf(STDERR, date("Y-m-d",$info['atime'])." - ".date("Y-m-d",$info['mtime'])."\n");
+					}
+				}
+
+			system("DDClearTimes ".$time_info);
+			unlink($location."/LOCK");  
+        }
+		}
+    /* 
+		$res_after = disk_free_space(getenv("DDBASE"));
+		$difference = ($res_after - $res_before)/1024.0;
+		$res_after /=  1024.0;
+		fprintf(STDERR,"+ Free Space  ".$difference." kB\n");
+		fprintf(STDERR,"  Free Space  ".$res_after." kB\n");*/
+		
+		$this->DDsysDoc->save($this->DDsys);
+		system("makeDDsys");	
+	}
 } 
 ?>   
  
@@ -0,0 +1,429 @@
+<?php
+
+class UserManagerClass
+{
+	protected $infoXml;
+	protected $stderr;
+	protected $rootElement;
+
+	function __construct($stderr)
+	{
+		$this->stderr = $stderr;
+
+		$this->infoXml = new DomDocument("1.0","UTF-8");
+		$this->infoXml->preserveWhiteSpace = false;
+		$this->infoXml->formatOutput = true;
+ 
+	}
+
+	function GetInfoXmlFilePath()
+	{
+		return getenv("DDINFO")."/".getenv("AMDA_USERS_INFO");
+	}
+
+	function GetGroupsXmlFilePath()
+	{
+		return getenv("DDINFO")."/".getenv("AMDA_GROUPS_INFO");
+	}
+
+	function LoadInfoXmlFile()
+	{
+		if (file_exists($this->GetInfoXmlFilePath())) 
+		{
+			$this->infoXml->load($this->GetInfoXmlFilePath());
+			$this->rootElement = $this->infoXml->documentElement;
+		}
+		else
+		{
+			$this->rootElement = $this->infoXml->createElement("users");
+			$this->infoXml->appendChild($this->rootElement);
+		}
+
+		return 1;
+	}
+
+	function AddUser($login, $pwd_hash, $first_name, $last_name, $email, $news, $groups)
+	{
+		if (!$this->LoadInfoXmlFile())
+		return 0;
+
+		$users = $this->infoXml->getElementsByTagName("user");
+
+		//test if login is already used
+		for ($i = 0; $i < $users->length; $i++)
+		{
+			$crtLogin = $users->item($i)->getAttribute("login");
+			if ($crtLogin == $login)
+				{
+					fprintf($this->stderr,"Login already exist on users info file\n");
+					return 0;
+				}
+		}
+
+		date_default_timezone_set('UTC');
+		$user = $this->infoXml->createElement("user");
+		$user->setAttribute("login",$login);
+		$user->setAttribute("name",$last_name);
+		$user->setAttribute("first_name",$first_name);
+		$user->setAttribute("group",$groups);
+		$user->setAttribute("email",$email);
+		$user->setAttribute("date",date('j/m/y'));
+		$user->setAttribute("news",$news);
+
+		$this->rootElement->appendChild($user);
+  
+
+		exec('DDadmin -a '.$login.' '.$pwd_hash,$output,$return);
+
+		if ($return != 0)
+		{
+			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
+			return 0;
+		}
+		else
+			$this->infoXml->save($this->GetInfoXmlFilePath());
+
+		return 1;
+	}
+
+	function ModifyUserPwd($login, $pwd_hash, $pwd_hash_new)
+	{
+		exec('DDadmin -m '.$login.' '.$pwd_hash.' '.$pwd_hash_new,$output,$return);
+
+		if ($return != 0)
+		{
+			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
+			return 0;
+		}
+		
+		return 1;
+	}
+
+	function ModifyUserGroup($login,$groups)
+	{
+		if (!$this->LoadInfoXmlFile())
+		return 0;
+
+		$users = $this->infoXml->getElementsByTagName("user");
+
+		for ($i = 0; $i < $users->length; $i++)
+		{
+			$crtLogin = $users->item($i)->getAttribute("login");
+			if ($crtLogin == $login)
+				{
+					$users->item($i)->setAttribute("group",$groups);
+					$this->infoXml->save($this->GetInfoXmlFilePath());
+					return 1;
+				}
+		}
+
+		fprintf($this->stderr,"Cannot found user\n");
+		return 0;
+	}
+
+	function ResetUserPwd($login)
+	{
+		exec('DDadmin -r '.$login,$output,$return);
+
+		if ($return != 0)
+		{
+			fprintf($this->stderr,"DDadmin error : ".$output."\n");
+			return 0;
+		}
+		else
+			fprintf($this->stderr,"New password is  : ".$output[0]."\n");
+		
+		return 1;
+	}
+
+	function DeleteUser($login)
+	{
+		if (!$this->LoadInfoXmlFile())
+				return 0;
+		
+		$users = $this->infoXml->getElementsByTagName("user");
+
+		for ($i = 0; $i < $users->length; $i++)
+		{
+			$crtLogin = $users->item($i)->getAttribute("login");
+			if ($crtLogin == $login)
+			{
+				$this->rootElement->removeChild($users->item($i));
+				break;
+			}
+		}
+
+		exec('DDadmin -d '.$login,$output,$return);
+
+		if ($return != 0)
+		{
+			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
+			return 0;
+		}
+
+		$this->infoXml->save($this->GetInfoXmlFilePath());
+		
+		return 1;
+	}
+
+	//This function will be deprecated for AMDA-NG
+	function GenerateGroupsXmlFile()
+	{
+		if (!$this->LoadInfoXmlFile())
+			return 0;
+
+		$users = $this->infoXml->getElementsByTagName("user");
+
+		$groupsXml = new DomDocument("1.0","UTF-8");
+		$groupsXml->preserveWhiteSpace = false;
+		$groupsXml->formatOutput = true;
+		$rootGroupsElement = $groupsXml->createElement("AMDA_USERS");
+		$groupsXml->appendChild($rootGroupsElement);
+			
+		for ($i = 0; $i < $users->length; $i++)
+		{
+			if (strcmp($users->item($i)->getAttribute("group"),"") == 0)
+					continue;
+			$u = $groupsXml->createElement("user",$users->item($i)->getAttribute("login"));
+			$u->setAttribute("group",$users->item($i)->getAttribute("group"));
+			$rootGroupsElement->appendChild($u);
+		}
+
+		$groupsXml->save($this->GetGroupsXmlFilePath());
+
+		return 1;
+	}
+
+	function SendRegistrationMail($login,$pwd,$first_name, $last_name, $email)
+	{
+		$subject = 'AMDA registration';
+
+		$msg  = "Dear $first_name $last_name, \r\n\r\n";
+		$msg .= "Thanks for your interest in AMDA\r\n\r\n";
+		$msg .= "Your login: $login \r\n";
+		$msg .= "  password: $pwd \r\n\r\n";
+		$msg .= "at http://cdpp3.irap.omp.eu \r\n\r\n";
+		$msg .= "Please contact us in case of any problems or questions.\r\n\r\n";
+		$msg .= "Best regards,\r\n\r\n";
+		$msg .= "CDPP-AMDA Team";
+	
+		$headers = "From: amda@irap.omp.eu " . "\r\n".
+						"Reply-To: amda@irap.omp.eu " . "\r\n".
+						"Cc: amda@irap.omp.eu" . "\r\n".
+						"Content-type: text/plain; charset=utf-8\r\n";
+		mail($email, $subject, $msg, $headers);
+
+	}
+
+	function Check()
+	{
+		if (!$this->LoadInfoXmlFile())
+			return 0;
+
+		$users = $this->infoXml->getElementsByTagName("user");
+
+		exec('DDadmin -l',$output,$return);
+
+		if ($return != 0)
+			{
+			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
+			return 0;
+			}
+			
+		$ddAdminUsers = explode(',',$output[0]);
+
+		for ($i = 0; $i < $users->length; $i++)
+		{
+			$found = false;
+			for ($j = 0; $j < count($ddAdminUsers); $j++)
+				if (strcmp($users->item($i)->getAttribute("login"),$ddAdminUsers[$j]) == 0)
+				{ 
+					$found = true;
+					break;
+				}
+			if (!$found)
+				fprintf($this->stderr,"User ".$users->item($i)->getAttribute("login")." not found on nc file\n");
+		}
+
+		for ($i = 0; $i < count($ddAdminUsers); $i++)
+		{
+			$found = false;
+			for ($j = 0; $j < $users->length; $j++)
+				if (strcmp($users->item($j)->getAttribute("login"),$ddAdminUsers[$i]) == 0)
+				{    
+					$found = true;
+					break;
+				}
+			if (!$found)
+				fprintf($this->stderr,"User ".$ddAdminUsers[$i]." not found on info file\n");
+		}
+
+		return 1;
+	}
+}
+
+//-----------------------------------------------------------------------------------------------------
+	//crypt the password with the salt corresponding to the login
+	function cryptPwd($login,$pwd)
+	{
+	exec('DDadmin -s '.$login,$output,$return);
+
+	if ($return != 0)
+			{
+		fprintf($this->stderr,"DDadmin error : ".$output."\n");
+		return '';
+			}
+
+	$salt = $output[0];
+
+	return crypt($pwd,$salt);
+	}
+
+//----------------------------------------------------------------------------------------------------
+	putenv("LD_LIBRARY_PATH=".getenv("LD_LIBRARY_PATH"));
+	putenv("PATH=./:".getenv("DDBASEBIN").":/bin:/usr/bin");
+
+	$stderr = fopen("php://stderr","w");
+
+	$shortopts  = "j:";
+	$longopts  = array("json:");
+	$options = getopt($shortopts, $longopts);
+	$json_file = "";
+	if (array_key_exists("json",$options)) {
+		$json_file = $options["json"];
+	}
+	else if (array_key_exists("j",$options)) {
+		$json_file = $options["j"];
+	}
+	
+	if (!empty($json_file)) {
+		if (!file_exists($json_file)) {
+			echo "[ERROR] Cannot find json file: ".$json_file.PHP_EOL;
+			exit(1);
+		}
+		$json_string = file_get_contents($json_file);
+		$args = json_decode($json_string);
+		if (empty($args)) {
+			echo "[ERROR] Cannot decode json data from: ".$json_file.PHP_EOL;
+			exit(1);
+		}
+	}
+	else {
+		$args = new stdClass();
+		$args->action = $argv[1];
+		switch ($args->action)
+	   {
+			case 'delete' :
+				$args->login = $argv[2];
+			break;
+			case 'groups' :
+				$args->login = $argv[2];
+				$args->groups = $argv[3];
+			break;
+			case 'add' :
+				$args->login = $argv[6];
+				$args->pwd = $argv[7];
+				$args->first_name= $argv[8];
+				$args->last_name= $argv[9];
+				$args->email= $argv[10];
+				$args->pwd_hashed = $argv[2];
+				$args->news= $argv[3];
+				$args->groups= $argv[4];
+				$args->sendEmail= $argv[5];
+			break;
+			default :
+			fprintf($stderr,"Not implemented action ".$args->action."\n");
+			exit;
+		}
+	}
+
+	if (!isset($args->action))
+	{
+		fprintf($stderr,"Missing action argument\n");
+		exit;
+	}
+
+	$userManager = new UserManagerClass($stderr);
+
+	switch ($args->action)
+	{
+		case 'add' :
+			if (!isset($args->login) || !isset($args->pwd) || !isset($args->first_name) || !isset($args->last_name) || 
+				!isset($args->email))
+			{
+				fprintf($stderr,"Missing argument(s) to add a user\n");
+				exit;
+			}
+			
+			if (isset($args->pwd_hashed) && !($args->pwd_hashed))
+				$pwd_hash = crypt($args->pwd,chr(rand(97,122)).chr(rand(97,122)));
+			else
+				$pwd_hash = $args->pwd;
+
+			if ($userManager->AddUser($args->login,$pwd_hash,$args->first_name,$args->last_name,$args->email, 
+							isset($args->news) ? $args->news : 1, 
+							isset($args->groups) ? $args->groups : ''))
+			{
+				$userManager->GenerateGroupsXmlFile();
+				if (isset($args->sendEmail) && $args->sendEmail)
+				$userManager->SendRegistrationMail($args->login,$args->pwd,$args->first_name,$args->last_name,$args->email);
+					fprintf($stderr,"User ".$args->login." added\n");
+			}
+		break;
+		case 'modify' :
+			if (!isset($args->login) || !isset($args->pwd) || !isset($args->pwd_new))
+			{
+				fprintf($stderr,"Missing argument(s) to modify the user password\n");
+				exit;
+			}
+
+			if (isset($args->pwd_hashed) && !($args->pwd_hashed))
+				$pwd_hash = cryptPwd($args->login,$args->pwd);
+			else
+				$pwd_hash = $args->pwd;
+
+			if (isset($args->pwd_new_hashed) && !($args->pwd_new_hashed))
+				$pwd_new_hash = crypt($args->pwd_new,chr(rand(97,122)).chr(rand(97,122)));
+			else
+				$pwd_new_hash = $args->pwd_new;
+		
+			if ($userManager->ModifyUserPwd($args->login,$pwd_hash,$pwd_new_hash))
+				fprintf($stderr,"Password of".$args->login." modified\n");
+		break;
+		case 'groups' : 
+			if (!isset($args->login) || !isset($args->groups))
+			{
+				fprintf($stderr,"Missing argument(s) to modify the user groups\n");
+				exit;
+			}
+			if ($userManager->ModifyUserGroup($args->login,$args->groups))
+			{
+				$userManager->GenerateGroupsXmlFile();
+				fprintf($stderr,"Groups of ".$args->login." modified\n");
+			}
+		break;
+		case 'reset' :
+			if (!isset($args->login))
+			{
+				fprintf($stderr,"Missing argument(s) to reset the user password\n");
+				exit;
+			}
+			$userManager->ResetUserPwd($args->login);
+		break;
+		case 'delete' :
+			if (!isset($args->login))
+			{
+				fprintf($stderr,"Missing argument(s) to delete user\n");
+				exit;
+			}
+			if ($userManager->DeleteUser($args->login))
+			{
+				$userManager->GenerateGroupsXmlFile();
+				fprintf($stderr,"User ".$args->login." deleted\n");
+			}
+		break;
+		case 'check' :
+			$userManager->Check();
+		break;
+	}
+?>
@@ -0,0 +1,25 @@
+
+PROJECT(DDadmin)
+
+include_directories(
+  ${DDCLIENTINCLUDE_DIR}
+  ${NETCDFINCLUDE_DIR}
+)
+
+#Configuration de l'exécutable
+file(
+        GLOB_RECURSE
+        source_files
+        ./*
+)
+  
+ADD_EXECUTABLE (DDadmin ${source_files} )
+
+target_link_libraries(
+  DDadmin
+  ${CRYPT_LIBRARY}
+  ${DDCLIENTLIBRARY}
+  ${NETCDFLIBRARY}
+)
+
+install (TARGETS DDadmin DESTINATION bin)
@@ -330,7 +330,7 @@ int GetFileInfo(t_UserFileInfo *fileInfo)
 {
   int status;
  
-  if (((status = nc_inq_unlimdim(fileInfo->ncID, (size_t *)&fileInfo->UserID))                       != NC_NOERR) ||
+  if (((status = nc_inq_unlimdim(fileInfo->ncID, (int *)&fileInfo->UserID))                       != NC_NOERR) ||
       ((status = nc_inq_dimlen(fileInfo->ncID, fileInfo->UserID,  (size_t *)&fileInfo->MaxRecords))  != NC_NOERR) ||
       ((status = nc_inq_dimid(fileInfo->ncID, NC_USER_LEN_NAME, &fileInfo->UserLenID))     != NC_NOERR) ||
       ((status = nc_inq_dimid(fileInfo->ncID, NC_PWD_LEN_NAME, &fileInfo->PwdLenID))       != NC_NOERR) ||
@@ -0,0 +1,8 @@
+Options -MultiViews +FollowSymLinks
+RewriteEngine on
+
+RewriteBase /~budnik/hapi/
+#remove the need for .php extention 
+RewriteCond %{REQUEST_FILENAME} !-d 
+RewriteCond %{REQUEST_FILENAME}\.php -f 
+RewriteRule ^(.*)$ $1.php
@@ -0,0 +1,3 @@
+ace-imf-all
+tao-mars-sw
+tao-venus-sw
@@ -0,0 +1,13 @@
+<?php
+    
+    $response = array();
+    $response["HAPI"] = "2.0"; 
+    $response["status"] = array("code" => 1200, "msg" => "OK");
+    $response["outputFormats"] = array("csv");
+
+    header('Content-Type: application/json');
+    header("Access-Control-Allow-Origin: *");
+    header("Access-Control-Allow-Methods: GET");
+
+    exit(json_encode($response));
+?>
@@ -0,0 +1,21 @@
+<?php
+    
+    $response = array();
+    $response["HAPI"] = "2.0"; 
+    $response["status"] = array("code" => 1200, "msg" => "OK");
+
+    $catalog = array();
+    $datasets = file("AMDA_HAPI.list");
+   
+    foreach ($datasets as $dataset) {
+        $catalog[] = array("id" => str_replace("\n","",$dataset));
+    }
+
+    $response["catalog"] = $catalog;
+    
+    header('Content-Type: application/json');
+    header("Access-Control-Allow-Origin: *");
+    header("Access-Control-Allow-Methods: GET");
+
+    exit(json_encode($response));
+?>
@@ -0,0 +1,83 @@
+<?php 
+
+   function rglob($pattern, $flags = 0) {
+        $files = glob($pattern, $flags); 
+        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) {
+            $files = array_merge($files, rglob($dir.'/'.basename($pattern), $flags));
+        }
+        return $files;
+    }
+
+    function disable_ob() {
+        // Turn off output buffering
+        ini_set('output_buffering', 'off');
+        // Turn off PHP output compression
+        ini_set('zlib.output_compression', false);
+        // Implicitly flush the buffer(s)
+        ini_set('implicit_flush', true);
+        ob_implicit_flush(true);
+        // Clear, and turn off output buffering
+        while (ob_get_level() > 0) {
+            // Get the curent level
+            $level = ob_get_level();
+            // End the buffering
+            ob_end_clean();
+            // If the current level has not changed, abort
+            if (ob_get_level() == $level) break;
+        }
+        // Disable apache output buffering/compression
+        if (function_exists('apache_setenv')) {
+            apache_setenv('no-gzip', '1');
+            apache_setenv('dont-vary', '1');
+        }
+    }   
+    
+    $METADATA_DIR = "/home/budnik/public_html/hapi/PARAM_DEF";
+    $response = array();
+    $response["HAPI"] = "2.0"; 
+
+    if (!$_GET["id"]) { 
+        header("HTTP/1.1 404 NO SUCH ID");
+        $response["status"] = 1406;
+        $response["msg"] = "NO SUCH ID !!!";
+
+        header('Content-Type: application/json');
+
+        exit(json_encode($response));
+    }
+
+    header('Content-Type: text/csv');
+
+    $id = $_GET["id"];
+    $tmin =  $_GET["time_min"];
+    $tmax =  $_GET["time_max"];
+
+    if ($_GET["parameters"]) {
+        $params = $_GET["parameters"];
+    }
+    else {
+        $params = null;
+    }
+     
+    $ddId = strtr($id, "-", "_");
+
+    if ($params) {                 
+        $cmd = "python -u reader.py -tmin $tmin -tmax $tmax -id $ddId -param $params";
+    }
+    else {
+        $cmd = "python -u reader.py -tmin $tmin -tmax $tmax -id $ddId";
+    }
+
+    disable_ob();
+    header("Access-Control-Allow-Origin: *");
+    header("Access-Control-Allow-Methods: GET");
+    $handle = popen($cmd, 'r');
+    while(!feof($handle)) {
+        $buffer = fgets($handle);
+        echo "$buffer";
+        ob_flush();
+    }
+
+    pclose($handle);
+
+?>
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Welcome on Amda</title> 
+</head>
+<body>
+<h2> Nice to see you </h2>
+</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,92 @@
+<?php
+
+    function rglob($pattern, $flags = 0) {
+        $files = glob($pattern, $flags); 
+        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) {
+            $files = array_merge($files, rglob($dir.'/'.basename($pattern), $flags));
+        }
+        return $files;
+    }
+
+    $METADATA_DIR = "PARAM_DEF";
+
+    $response = array();
+    $response["HAPI"] = "2.0"; 
+    header('Content-Type: application/json');
+
+    if (!$_GET["id"]) { 
+        $response["status"] = 404;
+        $response["msg"] = "No ID !!!";
+
+        exit(json_encode($response));
+    }
+   
+    $id = $_GET["id"];
+
+    if ($_GET["parameters"]) {
+        $paramRequest = explode(",",$_GET["parameters"]);
+    } 
+    else {
+        $paramRequest = null;
+    }
+
+    $pattern = "$id.xml";
+    $files = rglob($pattern);
+
+    $xmlName = $files[0];
+    
+    if (!file_exists($xmlName)) {;
+            header("HTTP/1.1 404 NO SUCH ID");
+            $response["status"] = array("code" => 1406, "message" => "NO SUCH ID"); 
+        exit(json_encode($response));
+    }
+
+    $dom = new DomDocument("1.0");
+    $dom->load($xmlName);  
+
+    $dataset = $dom->getElementsByTagName("Spase")->item(0);
+
+    $parameters = $dataset->getElementsByTagName('Parameter');
+    if ( $parameters->length == 0 ) {
+        header("HTTP/1.1 404 NO PARAMETERS");
+        $response["status"] = array("code" => 1406, "message" => "NO  PARAMETERS");       
+        exit(json_encode($response));
+    }
+
+    $paramDom = new DomDocument("1.0");  
+ 
+    $parametersResponse = array(array("name" => "Time", "type" => "isotime", "length" => 20, "units" => "", "fill" =>""));
+    foreach ( $parameters as $param ) {  
+        $oneParam = array();
+        $oneParam["type"] = "double";
+        $paramId =  $param->getElementsByTagName('ParameterKey')->item(0)->nodeValue;
+        if (file_exists("$METADATA_DIR/$paramId.xml")) {
+            $paramDom->load("$METADATA_DIR/$paramId.xml");
+            $process = $paramDom->getElementsByTagName("process")->item(0)->nodeValue;
+            if (!$process) { 
+                $baseParam = $paramDom->getElementsByTagName("baseParam")->item(0);                  
+                $oneParam["name"] = $baseParam->getAttribute('name');
+                $oneParam["description"] = $param->getElementsByTagName('Description')->item(0)->nodeValue;
+                $oneParam["fill"] = $param->getElementsByTagName('FillValue')->item(0)->nodeValue;
+                $oneParam["units"] = $param->getElementsByTagName('Units')->item(0)->nodeValue;
+                $size = $param->getElementsByTagName('Size');
+                if ($size->length > 0) {
+                    $oneParam["size"] = array(intval($size->item(0)->nodeValue));
+                }
+                if ($paramRequest && !in_array($baseParam->getAttribute('name'), $paramRequest)) { 
+                   //
+                } else  {
+                    $parametersResponse[] = $oneParam;
+                }
+            }
+        }
+    }
+
+    $response["startDate"] = $dataset->getElementsByTagName('StartDate')->item(0)->nodeValue;
+    $response["stopDate"] = $dataset->getElementsByTagName('StopDate')->item(0)->nodeValue;
+    $response["cadence"] = $dataset->getElementsByTagName('Cadence')->item(0)->nodeValue;
+    $response["parameters"] = $parametersResponse;
+    $response["status"] = array("code" => 1200, "msg" => "OK");
+
+    exit(json_encode($response));
+?>
 \ No newline at end of file
@@ -0,0 +1,385 @@
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
+
+
+"""
+    Python reader to stream csv HAPI formatted data
+    python reader.py -tmin 1991-01-01T00:00:00 -tmax 1992-01-01T00:00:00 -id tao_mars_dsc -path /Users/aloh/Documents/Work/HAPI/hapi_amda/data/tao/TAO/MARS/SW/
+    
+    gcc GetFileNames.c DD_time.c -lnetcdf -o GetFileNames
+"""
+
+
+import sys
+import os
+import shutil
+import gzip
+import tempfile
+import time
+import calendar
+import datetime
+import dateutil.parser
+import xml.etree.ElementTree as ET
+import numpy
+from numpy import __version__ as numpy_version
+from collections import OrderedDict
+
+#import ctypes
+import subprocess
+
+
+
+#_DDSYS_PATH = os.environ['DDBASE'] + '/DDsys.xml'
+#_GETFILENAMES = os.environ['DDBASEBIN'] + '/GetFileNames'
+_DDSYS_PATH = '/data/DDBASE/DATA/DDsys.xml'
+_GETFILENAMES = '/home/budnik/AMDANEW/DDLIB/bin/GetFileNames'
+os.environ['LD_LIBRARY_PATH'] = '/home/budnik/AMDANEW/DDLIB/lib/' 
+
+from netCDF4 import Dataset as ncDataset
+from netCDF4 import __version__ as netCDF_version
+
+#print('# numpy: {}, netCDF4: {}'.format(numpy_version, netCDF_version))
+# recommended: numpy='1.11.3', netCDF4='1.4.2'
+
+
+def parse_arguments(argv):
+    """ Re-organize the arguments
+        ['-x', '34', '-y', '-z', '2']
+        would become
+        [['-x', '34'], ['-y', True], ['-z', '2']]
+    """
+    newargv = []
+    i = 0
+    while i < len(argv):
+        argtuple = [0, 0]
+        if argv[i].startswith('-'):
+            argtuple[0] = argv[i]
+            if i == len(argv)-1:
+                argtuple[1] = True
+                i += 1
+            elif argv[i+1].startswith('-'):
+                argtuple[1] = True
+                i += 1
+            else:
+                argtuple[1] = argv[i+1]
+                i += 2
+        else:
+            i += 1
+        newargv.append( tuple(argtuple) )
+    return newargv
+
+
+def read_time_arg(argv, name):
+    """ Read the requested time argument.
+
+        Parameters
+        ----------
+        argv : list
+            List of arguments
+        name : str
+            tmin or tmax
+
+        Returns
+        -------
+        time : str
+            Time correctly formatted
+    """
+    assert name in ['tmin', 'tmax'], 'name should be tmin or tmax'
+
+    for arg in argv:
+
+        if name in arg[0].lower():
+
+            # Check the time format
+            time = arg[1]
+            assert isinstance(time, str), 'time is not a string'
+
+            try:
+                istime = (time[4] == '-') & (time[8] == 'T') & (time[11] == ':') & (time[14] == ':')
+            except:
+                istime = False
+            #assert istime, 'time doesnt seem like yyyy-dddThh:mm:ss'
+
+            return dateutil.parser.parse(time, ignoretz=True)
+
+    return None
+
+
+def read_id_arg(argv):
+    """ Read the requested ID argument
+
+        Parameters
+        ----------
+        argv : list
+            List of arguments
+    """
+    for arg in argv:
+
+        if 'id' in arg[0].lower():
+
+            iden = arg[1]
+
+            return iden
+
+    return None
+
+
+def read_param_arg(argv):
+    """ Read the requested parameters argument
+
+        Parameters
+        ----------
+        argv : list
+            List of arguments
+    """
+    for arg in argv:
+
+        if ('param' in arg[0].lower()) or ('parameters' in arg[0].lower()):
+
+            params = arg[1].split(',')
+
+            return params
+
+    return None
+
+
+def read_path_arg(argv): 
+    """ Read the requested parameters argument
+
+        Parameters
+        ----------
+        argv : list
+            List of arguments
+    """
+    for arg in argv:
+
+        if 'path' in arg[0].lower():
+
+            path = arg[1]
+
+            return path
+
+    return None
+
+def open_netcdf(fname):
+    if fname.endswith(".gz"):
+        infile = gzip.open(fname, 'rb')
+        tmp = tempfile.NamedTemporaryFile(delete=False)
+        shutil.copyfileobj(infile, tmp)
+        infile.close()
+        tmp.close()
+        data = ncDataset(tmp.name)
+        os.unlink(tmp.name)
+    else:
+        data = ncDataset(fname)
+    return data
+
+
+def amda_to_datetime(amda_time):
+    """
+    Convert amda DD time to datetime.
+    :param amda_time: (string) encoded time.
+    :return: (datetime.datetime)
+    """
+    # str_time_year = "".join([c.item().decode('ascii') for c in amda_time[0:4]])
+    # str_time_jday = "{:03d}".format(int("".join([c.item().decode('ascii') for c in amda_time[4:7]]))+1)
+    # str_time_hmsm = "".join([c.item().decode('ascii') for c in amda_time[7:]])
+
+    str_time_year = "".join(amda_time[0:4])
+    str_time_jday = "{:03d}".format(int("".join(amda_time[4:7]))+1)
+    str_time_hmsm = "".join([c for c in amda_time[7:] if isinstance(c, str)])
+    return datetime.datetime.strptime(str_time_year+str_time_jday+str_time_hmsm+'000',"%Y%j%H%M%S%f")
+
+
+def get_metadata_from_ddsys(name, localpath):
+    """
+    Get dataset information from ddsys.xml file, using dataset name
+    :param name: (string) DD dataset name
+    :return: (dict)
+    """
+
+    metadata = {}
+    dd_sys = ET.parse(_DDSYS_PATH)
+    for record in dd_sys.getroot().iter('VI'):
+
+        # selecting only the <VI>...</VI> element with the correct ID
+        if record[0].text == name:
+
+            for child in record:
+                metadata[child.tag] = child.text
+
+    if localpath is None:
+        localpath = metadata['LOCATION']
+
+    dd_info = ET.parse('{}{}'.format(localpath, metadata['INFO'].replace('.nc', '.xml')))
+    for child in dd_info.getroot():
+        if child.tag.startswith('Global') or child.tag.startswith('Local'):
+            metadata[child.tag] = dateutil.parser.parse(child.text, ignoretz=True)
+        else:
+            metadata[child.tag] = child.text
+
+    return metadata
+
+
+def get_start_stop_from_times_nc_file_v0(metadata, localpath):
+    """
+    Get StartTime, StopTime and FileName from the times.nc file of th current dataset
+    :param metadata: (dict) DDsys metadata for the current dataset
+    :return: (numpy.array, numpy.array, numpy.array)
+    """
+    if localpath is None:
+        localpath = metadata['LOCATION']
+
+    times_nc_file = "{}{}".format(localpath, metadata['TIMES'])
+    
+    times_nc_data = open_netcdf(times_nc_file)
+
+    def parse_filename(name_array, localpath=localpath):
+        return "{}{}".format(localpath, ''.join(name_array.data))
+
+    start = map(amda_to_datetime, times_nc_data.variables['StartTime'])
+    stop = map(amda_to_datetime, times_nc_data.variables['StopTime'])
+    filenames = map(parse_filename, times_nc_data.variables['FileName'])
+
+    # return numpy.array([amda_to_datetime(item) for item in times_nc_data.variables['StartTime']]), \
+    #        numpy.array([amda_to_datetime(item) for item in times_nc_data.variables['StopTime']]), \
+    #        numpy.array(["{}{}".format(localpath, ''.join(item.data))
+    #                     for item in times_nc_data.variables['FileName']])
+    return numpy.array(start), numpy.array(stop), numpy.array(filenames)
+
+
+def get_start_stop_from_times_nc_file(metadata, localpath, tmin, tmax):
+    """
+    """
+
+    if localpath is None:
+        localpath = metadata['LOCATION']
+
+    times_nc_file = "{}{}".format(localpath, metadata['TIMES'])
+    start =  calendar.timegm(tmin.timetuple())
+    stop =  calendar.timegm(tmax.timetuple())
+
+    command = _GETFILENAMES+' '+str(times_nc_file)+' '+str(start)+' '+str(stop)
+    result = subprocess.check_output(command, shell=True)
+    result = result.strip(';').split(';')
+    result = ['{}{}'.format(localpath, rr) for rr in result]
+    return result
+
+
+def check_time_range(tmin, tmax, metadata):
+    """ Check that start and stop are within the metadata Global time range
+
+        Parameters
+        ----------
+        tmin : datetime
+        tmax : datetime
+        metadata : dict
+    """
+    if tmin < metadata['GlobalStart']:
+        raise ValueError('tmin lower than GlobalStart {}'.format(metadata['GlobalStart']))
+    if tmax > metadata['GlobalStop']:
+        raise ValueError('tmax greater than GlobalStop {}'.format(metadata['GlobalStop']))
+    return
+
+
+#--------------------------------------------------#
+def main(argv):
+    argv = parse_arguments(argv)
+
+    tmin = read_time_arg(argv, 'tmin')
+    tmax = read_time_arg(argv, 'tmax')
+    iden = read_id_arg(argv)
+    para = read_param_arg(argv)
+    path = read_path_arg(argv)
+
+    meta = get_metadata_from_ddsys(iden, localpath=path)
+    check_time_range(tmin, tmax, meta)
+
+    # start, stop, files = get_start_stop_from_times_nc_file(meta, localpath=path, tmin=tmin, tmax=tmax)
+
+    # timemask = (start <= tmax) & (stop >= tmin)
+
+    # for ncfile in files[timemask]:
+
+    files = get_start_stop_from_times_nc_file(meta, localpath=path, tmin=tmin, tmax=tmax)
+    for ncfile in files:
+        nc = open_netcdf(ncfile + '.gz')
+        cur_start_time = amda_to_datetime(nc.variables['StartTime'])  # extract amda-formatted start_time
+        cur_end_time = amda_to_datetime(nc.variables['StopTime'])  # extract amda-formatted end_time
+
+        variables = nc.variables
+        # if para is not None:
+            # para_dict = []
+            # para_vari = []
+            # for par in para:
+            #     if ('[' in par) & (']' in par):
+            #         para_index = int(par[par.find('[')+1:par.find(']')])
+            #         para_name = par.split('[')[0]
+            #     else:
+            #         para_index = None
+            #         para_name  = par
+            #     para_dict.append( (para_name, para_index) )
+            #     para_vari.append( (para_name, variables[para_name]))
+
+            # var_index = OrderedDict(para_dict)
+            # variables = OrderedDict(para_vari)
+
+            # print(var_index)
+            # print(variables)
+
+        if para is not None:
+            variables = OrderedDict([(key.split('[')[0], variables[key.split('[')[0]]) for key in para])
+            var_index = OrderedDict([(key.split('[')[0], []) for key in para])
+
+            for par in para:
+                if ('[' in par) & (']' in par):
+                    para_index = int(par[par.find('[')+1:par.find(']')])
+                    para_name = par.split('[')[0]
+                else:
+                    para_index = None
+                    para_name  = par
+                var_index[para_name].append(para_index)
+         
+            #variables = OrderedDict([(key, variables[key]) for key in para])
+        if tmin <= cur_end_time and tmax >= cur_start_time:  # checking if file contains data within interval
+                # time = [amda_to_datetime(cur_time) for cur_time in nc.variables['Time']]
+                time = map(amda_to_datetime, nc.variables['Time'])
+
+                for cur_index, cur_dt in enumerate(time):
+                    if cur_dt > tmax:
+                        break
+
+                    if cur_dt >= tmin and cur_dt <= tmax:
+                        stream = '{}'.format(cur_dt.isoformat())                      
+                        for var in variables:
+                            if not 'Time' in var:
+                                cur_data = nc.variables[var][cur_index]
+
+                                # check if this is a vector (for the velocity)
+                                # assert isinstance(cur_data, numpy.ndarray), '{}, index {} is not a numpy.ndarray'.format(var, cur_index)
+                                if isinstance(cur_data, numpy.ndarray):
+                                    if cur_data.size > 1:
+                                        # for item in cur_data:
+                                        #    stream += ', {}'.format(item)
+                                        
+                                        if para is not None:
+                                            if var_index[var] == [None]:
+                                                for item in cur_data:
+                                                    stream += ', {}'.format(item)
+                                            else:
+                                                for i in var_index[var]:
+                                                    stream += ', {}'.format(cur_data[i])
+                                        else:
+                                            for item in cur_data:
+                                                stream += ', {}'.format(item)
+                                    else:  
+                                        stream += ', {}'.format(cur_data)
+                                else:  
+                                        stream += ', {}'.format(cur_data)
+                        print(stream)
+        
+#--------------------------------------------------#
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
@@ -0,0 +1,11 @@
+<?php
+
+  require_once 'DDserverWeb.php';
+
+  $ddserveur_ws = new DDService();
+
+  $res = $ddserveur_ws->getDataUrl($_GET['dataSet'],$_GET['StartTime'],$_GET['StopTime']);
+
+  echo json_encode($res);
+
+?>
@@ -13,7 +13,7 @@
  
   //  $dataSet = strtr($_GET['id'], $replace); 
  
-    $referXML = baseDir."DDsys.xml";
+    $referXML = baseDir."/DDsys.xml";
     $DDsys = new DOMDocument("1.0");
     $DDsys->load($referXML);
  
@@ -18,7 +18,7 @@
            exit();
        }
        $ddSys = new DOMDocument('1.0');
-       $ddSys->load(baseDir."DDsys.xml");
+       $ddSys->load(baseDir."/DDsys.xml");
        $xp = new DOMXpath($ddSys);
  
        $VI = $xp->query("//NAME[.='".$dataSet."']"); 
@@ -0,0 +1,39 @@
+<?php
+/** 
+*   @file getLastRealUpdate.php
+*   @brief Returns modif date of the last modified data file (*.nc.gz) for a given DataSet 
+*   @version $Id:  $ 
+*/
+
+    if (!isset($_GET['id'])) exit('INPUT ERROR');
+    
+    require_once './DDserverWeb_ini.php';
+    
+    error_reporting(E_ERROR | E_WARNING | E_PARSE);
+
+    $replace = array("-" => "_");
+
+    $dataSet = strtr($_GET['id'], $replace); 
+
+    $referXML = baseDir."/DDsys.xml";
+    $DDsys = new DOMDocument("1.0");
+    $DDsys->load($referXML);
+    $xp = new domxpath($DDsys);
+    $VI_NAME = $xp->query("//NAME[.='".$dataSet."']");
+
+    if ($VI_NAME->item(0)->nodeValue != NULL)
+    {
+            $VI = $VI_NAME->item(0)->parentNode;
+            $location = $VI->getElementsByTagName("LOCATION")->item(0)->nodeValue;                     
+            $find = 'find '.$location.' -name \'*.nc.gz\' -type f -printf \'%T@ %p\n\' | sort -n | tail -1 | cut -f2- -d" "';
+            $lastFile = exec($find);
+            if (!file_exists($lastFile))
+                exit('NO SUCH FILE '.$lastFile);
+            $cmd = 'date "+%Y-%m-%dT%H:%M:%SZ" -u -r '.$lastFile;  // for NFS      
+            $dateModif = exec($cmd);       
+            exit($dateModif); 
+    }
+    else {
+            exit('NO SUCH DATASET');
+    }
+?>
@@ -0,0 +1,40 @@
+<?php
+  
+/** 
+*   @file getLastUpdate.php
+*   @brief Returns last modif of *_times.nc for a given DataSet 
+*   @version $Id:  $ 
+*/
+
+    if (!isset($_GET['id'])) exit('INPUT ERROR');
+    
+    require_once './DDserverWeb_ini.php';
+    
+    error_reporting(E_ERROR | E_WARNING | E_PARSE);
+
+    $replace = array("-" => "_");
+
+    $dataSet = strtr($_GET['id'], $replace); 
+
+    $referXML = baseDir."/DDsys.xml";
+    $DDsys = new DOMDocument("1.0");
+    $DDsys->load($referXML);
+    $xp = new domxpath($DDsys);
+    $VI_NAME = $xp->query("//NAME[.='".$dataSet."']");
+  
+    if ($VI_NAME->item(0)->nodeValue != NULL)
+    {
+            $VI = $VI_NAME->item(0)->parentNode;
+            $location = $VI->getElementsByTagName("LOCATION")->item(0)->nodeValue;           
+            $times = $VI->getElementsByTagName("TIMES")->item(0)->nodeValue; 
+            if (!file_exists($location.$times))
+                exit('NO TIMES FILE'); 
+                
+            $cmd = 'date "+%Y-%m-%dT%H:%M:%SZ" -u -r '. $location.$times;  // for NFS      
+            $dateModif = exec($cmd);       
+            exit($dateModif); 
+    }
+    else {
+            exit('NO SUCH DATASET');
+    }
+?>
@@ -0,0 +1,43 @@
+<?php
+  
+/** 
+*   @file getStartStop.php
+*   @brief Returns GlobalStart - GlobalStop for a given DataSet 
+*   @version $Id:  $ 
+*/
+
+		if (!isset($_GET['id'])) exit('INPUT ERROR');
+		
+		require_once './DDserverWeb_ini.php';
+		
+		error_reporting(E_ERROR | E_WARNING | E_PARSE);
+
+		$replace = array("-" => "_");
+
+		$dataSet = strtr($_GET['id'], $replace); 
+
+		$referXML = baseDir."/DDsys.xml";
+		$DDsys = new DOMDocument("1.0");
+		$DDsys->load($referXML);
+		$xp = new domxpath($DDsys);
+		$VI_NAME = $xp->query("//NAME[.='".$dataSet."']");
+
+		if ($VI_NAME->item(0)->nodeValue != NULL)
+		{
+				$VI = $VI_NAME->item(0)->parentNode;
+				$location = $VI->getElementsByTagName("LOCATION")->item(0)->nodeValue;           
+				$info = basename($VI->getElementsByTagName("INFO")->item(0)->nodeValue, '.nc').'.xml'; 
+				if (!file_exists($location.$info))
+						exit('NO INFO XML');
+				
+				$infoDom = new DOMDocument("1.0");
+				$infoDom->loadXML(file_get_contents($location.$info)); // for NFS
+
+				$Start = $infoDom->getElementsByTagName("GlobalStart")->item(0)->nodeValue;
+				$Stop = $infoDom->getElementsByTagName("GlobalStop")->item(0)->nodeValue;
+						exit($Start.",".$Stop);
+		}
+		else {
+				exit('NO SUCH DATASET');
+		}
+?>
@@ -114,7 +114,7 @@
  
         function getUserGroups() 
          {                 
-              if (file_exists(extBaseDir."AMDA_Users.xml"))  return extWebAlias."AMDA_Users.xml";
+              if (file_exists(extBaseDir."/AMDA_Users.xml"))  return extWebAlias."AMDA_Users.xml";
               else return NOUSERGROUPSSPECIFIED;     
           }
  
@@ -157,9 +157,9 @@
 	{
           //get user
           $user_dom = new DomDocument("1.0");
-          if (!file_exists(extBaseDir."AMDA_Users.xml"))
+          if (!file_exists(extBaseDir."/AMDA_Users.xml"))
             return  array();
-          $user_dom->load(extBaseDir."AMDA_Users.xml");
+          $user_dom->load(extBaseDir."/AMDA_Users.xml");
  
           $user_nodes = $user_dom->getElementsByTagName('user');
  
@@ -183,9 +183,9 @@
  
 	  //get local missions
 	  $mis_dom = new DomDocument("1.0");
-	  if (!file_exists(extBaseDir."Missions.xml"))
+	  if (!file_exists(extBaseDir."/Missions.xml"))
 	    return array();
-	  $mis_dom->load(extBaseDir."Missions.xml");
+	  $mis_dom->load(extBaseDir."/Missions.xml");
  
 	  $local_nodes = $mis_dom->getElementsByTagName('Local');
 	  if ($local_nodes->length < 1)
@@ -307,20 +307,75 @@
         }
     }
  
+/**     
+*       Returns date of last modif of *times.nc  in DD Base 
+*/ 
+
+        function getLastUpdate($dataSet) 
+         {                  
+				$referXML = baseDir."/DDsys.xml";
+            $DDsys = new DOMDocument("1.0");
+            $DDsys->load($referXML);
+            $xp = new domxpath($DDsys);
+            $VI = $xp->query("//NAME[.='".$dataSet."']"); 
+ 
+            if ($VI->item(0)->nodeValue != NULL)
+            {
+					$location = $VI->item(0)->parentNode->getElementsByTagName("LOCATION")->item(0)->nodeValue;           
+					$times = $VI->getElementsByTagName("TIMES")->item(0)->nodeValue; 
+					if (!file_exists($location.$times))
+						return null; 
+                
+					$cmd = 'date "+%Y-%m-%dT%H:%M:%SZ" -u -r '. $location.$times;  // for NFS      
+					$dateModif = exec($cmd);    
+						return $dateModif; 
+				 }
+				 
+				 return null;
+          }
+          
+/**     
+*        Returns modif date of the last modified data file (*.nc.gz) for a given DataSet 
+*/ 
  
+        function getLastRealUpdate($dataSet) 
+         {                  
+				$referXML = baseDir."/DDsys.xml";
+            $DDsys = new DOMDocument("1.0");
+            $DDsys->load($referXML);
+            $xp = new domxpath($DDsys);
+            $VI = $xp->query("//NAME[.='".$dataSet."']"); 
+ 
+            if ($VI->item(0)->nodeValue != NULL)
+            {
+					$location = $VI->item(0)->parentNode->getElementsByTagName("LOCATION")->item(0)->nodeValue;
+					
+					$find = 'find '.$location.' -name \'*.nc.gz\' -type f -printf \'%T@ %p\n\' | sort -n | tail -1 | cut -f2- -d" "';
+					$lastFile = exec($find);
+					if (!file_exists($lastFile))
+						exit('NO SUCH FILE '.$lastFile);
+					$cmd = 'date "+%Y-%m-%dT%H:%M:%SZ" -u -r '.$lastFile;  // for NFS  
+    
+					$dateModif = exec($cmd);    
+						return $dateModif; 
+				 }
+				 
+				 return null;
+          }
+          
+          
 /**     
 *       Returns String Start-Stop for local DataSet  in DD Base 
 */ 
  
         function getStartStop($dataSet) 
           {                  
-            if ($dataSet != "compound") {  
-                      $referFile = baseDir."/refer.nc";          
-                      $cmd = DDBASEBIN."/StartStop ".$referFile." ".$dataSet;  
-                      $res = system($cmd);
-                        
-                      return $res;
-              }
+
+					$referFile = baseDir."/refer.nc";          
+					$cmd = DDBASEBIN."/StartStop ".$referFile." ".$dataSet;  
+					$res = system($cmd);
+					
+					return $res;
           }
  
 /**     
@@ -62,6 +62,18 @@
 <message name='getStartStopResponse'>
  <part name='Result' type='xsd:string'/>
 </message>
+<message name='getLastUpdateRequest'>
+  <part name='dataSet' type='xsd:string'/>
+</message>
+<message name='getLastUpdateResponse'>
+ <part name='Result' type='xsd:string'/>
+</message>
+<message name='getLastRealUpdateRequest'>
+  <part name='dataSet' type='xsd:string'/>
+</message>
+<message name='getLastRealUpdateResponse'>
+ <part name='Result' type='xsd:string'/>
+</message>
 <message name='getInfoRequest'>
   <part name='dataSet' type='xsd:string'/>
   <part name='infoName' type='xsd:string'/>
@@ -147,6 +159,14 @@
    <operation name='getStartStop'>
     <input message='tns:getStartStopRequest'/>
     <output message='tns:getStartStopResponse'/>
+  </operation>  
+  <operation name='getLastUpdate'>
+    <input message='tns:getLastUpdateRequest'/>
+    <output message='tns:getLastUpdateResponse'/>
+  </operation>
+  <operation name='getLastRealUpdate'>
+    <input message='tns:getLastRealUpdateRequest'/>
+    <output message='tns:getLastRealUpdateResponse'/>
   </operation>   
   <operation name='getInfo'>
     <input message='tns:getInfoRequest'/>
@@ -240,7 +260,29 @@
       <soap:body use='encoded'
         encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
     </output>
-  </operation>    
+  </operation>  
+  <operation name='getLastUpdate'>
+    <soap:operation soapAction='getLastUpdate'/>
+    <input>
+      <soap:body use='encoded'
+        encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+    </input>
+    <output>
+      <soap:body use='encoded'
+        encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+    </output>
+  </operation>  
+  <operation name='getLastRealUpdate'>
+    <soap:operation soapAction='getLastRealUpdate'/>
+    <input>
+      <soap:body use='encoded'
+        encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+    </input>
+    <output>
+      <soap:body use='encoded'
+        encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+    </output>
+  </operation>   
   <operation name='getInfo'>
     <soap:operation soapAction='getSInfo'/>
     <input>
@@ -1392,7 +1392,7 @@ char	* ptr;
             while (uiPtr == NULL || dPtr == NULL) {
                uiPtr = (unsigned int *) malloc (sizeof(unsigned int) * numValues * numRecs);
                dPtr = (double *) malloc (sizeof(double) * numValues * numRecs);
-               if (iPtr == NULL) {
+               if (uiPtr == NULL) {
                    if (DEBUG) insufficient_memory();
                    divide *= 2;
                    numRecs = totRecs / divide;
@@ -438,7 +438,8 @@ class CDAWEB extends RemoteDataCenterClass
 	   {
 			error_log("ERROR no response for : ".$ds." : ".$start." - ".$stop.PHP_EOL,3,err);
 			error_log($res->saveXML(),3,err);
-			exit();
+			$this->closeConnection();
+			return array();
 	   }
  
 	   $fileNames = $res->getElementsByTagName("Name");
@@ -30,6 +30,7 @@ abstract class RemoteDataCenterClass
 	{		
 		$this->baseID = get_class($this);
 		$this->location = RemoteData."/bases/".$this->baseID;
+		date_default_timezone_set('UTC');
 	}
  
 	/*    Function to change  External Bases stuff in case of existing AMDA aliases.
@@ -75,12 +76,12 @@ abstract class RemoteDataCenterClass
 	public function initProxy() 
 	{	 
 		if (!is_dir($this->location))
-				mkdir($this->location, 0755, true);
+				mkdir($this->location, 0775, true);
  
 		$this->DDserverDir = RemoteData."/DDServer/".$this->baseID;
  
 		if (!is_dir($this->DDserverDir)) 
-				mkdir($this->DDserverDir, 0755, true);		
+				mkdir($this->DDserverDir, 0775, true);		
  
 		$this->init();
  
@@ -8,26 +8,26 @@ class THEMIS extends RemoteDataCenterClass
 {
 	// /THEMIS_B1/themisdata
  
-   protected $baseMgr;
+	protected $baseMgr;
 	protected $domTemplate;
-	 
+	protected $xmlTemplate; 
  
 	public function init() 	
 	{			
 		error_log("THEMIS Proxy creation on ".date("Y-m-d\TH:i:s").PHP_EOL,3,log);
 		error_log("THEMIS Proxy creation on ".date("Y-m-d\TH:i:s").PHP_EOL,3,err);
-
+		$this->xmlTemplate = strval(RemoteData).ThemisConfigClass::$TemplateXml;
 	} 
  
 	protected function getRemoteTree()	
 	{
-		if (!file_exists(ThemisConfigClass::$TemplateXml)) {
+		if (!file_exists($this->xmlTemplate)) {
 			error_log('Cannot find THEMIS tree template'.PHP_EOL,3,err); 
 			exit('Cannot find THEMIS tree template');
 		}
  
 		$this->domTemplate = new DomDocument("1.0");
-		if (!$this->domTemplate->load(ThemisConfigClass::$TemplateXml)) {
+		if (!$this->domTemplate->load($this->xmlTemplate)) {
 			error_log('Cannot load THEMIS tree template'.PHP_EOL,3,err); 
 			exit('Cannot load THEMIS tree template');
 		}
@@ -13,8 +13,8 @@ class ThemisConfigClass
 	public static $NFS_DIR = "/THEMIS_B1/themisdata";
 	public static $level = "l2"; 
 	public static $format = "cdf";
-	public static $themis = array('A'); //, 'B', 'C', 'D', 'E');
-	public static $TemplateXml = "ThemisTreeTemplate.xml";
+	public static $themis = array('A', 'B', 'C', 'D', 'E');
+	public static $TemplateXml = "/ThemisTreeTemplate.xml";
 	public static $START_YEAR = "2007";
 	public static $program = array('peim' => 'themis_esamom2nc', 'peem' => 'themis_esamom2nc',
 											 'peif' => 'themis_esa2nc', 'peef' => 'themis_esa2nc',
@@ -24,7 +24,7 @@
  
 	$LOGDIR = $DDBASE."/../LOG";
 	if (!is_dir($LOGDIR))
-				mkdir($LOGDIR, 0755, true);
+				mkdir($LOGDIR, 0775, true);
  
 	define("log",$LOGDIR."/ProxyCreate.log");
 	define("err",$LOGDIR."/ProxyCreate.err");
@@ -34,6 +34,11 @@
  
 	define('RemoteData',  $DDBASE."/../INFO");
  
+	// check permissions
+	$perms = fileperms(RemoteData);
+	if (! ($perms & 0x0010)) 
+		exit('chmod -R g+wrx INFO dir !!! no write perms for group (apache)'.PHP_EOL);
+	
 	if (!file_exists(RemoteData."/Bases.xml"))
 			exit('No Bases.xml'.PHP_EOL);
  
@@ -44,8 +49,7 @@
 	$bases = $basesDom->getElementsByTagName("dataCenter");
 	if ($bases->length == 0)
 			exit('No Bases'.PHP_EOL);
-	
-//	$bases = array("CDAWEB");
+
 	$useSpase = true; 
  
 	foreach ($bases as $base)
@@ -271,6 +271,7 @@ int  VarSize(nc_type type)
 size_t MaxRecord(int ncID)
 /* ncID - ID of already open NC file */
 {
+  static char TimeDimName[] = "Time";
   int timedimid;   /* ID for dimension "Time" */
  
   int nvars;
@@ -290,7 +291,7 @@ size_t MaxRecord(int ncID)
   /*--- general information -------*/
   status = nc_inq_ndims(ncID,&ndims);
   status = nc_inq_nvars(ncID,&nvars);
-  status = nc_inq_unlimdim(ncID, &timedimid); /* What is unlimited dimension ID */
+  status = nc_inq_dimid(ncID,TimeDimName,&timedimid);
  
   /*---- memory allocation --------*/
   dimleng_arr = (size_t *)malloc(ndims * sizeof(size_t));