diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fdcc86..3d593d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,8 @@ 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)
diff --git a/info/REMOTEDATA/Bases.xml b/info/REMOTEDATA/Bases.xml
new file mode 100644
index 0000000..8e52ba3
--- /dev/null
+++ b/info/REMOTEDATA/Bases.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<dataRoot xml:id="myRemoteData-treeRootNode">
+ <dataCenter name="CDAWeb" desc="Coordinated_Data_Analysis" 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>
+
diff --git a/info/REMOTEDATA/ThemisTreeTemplate.xml b/info/REMOTEDATA/ThemisTreeTemplate.xml
new file mode 100644
index 0000000..1a61f91
--- /dev/null
+++ b/info/REMOTEDATA/ThemisTreeTemplate.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<dataCenter name="THEMIS" xml:id="THEMIS-IRAP" desc="Mirror IRAP Data Base">
+ <mission name="THEMIS-XXX" xml:id="THEMIS-xxx" desc="THEMIS-XXX">
+ <instrument name="ESA" xml:id="THEMIS-xxx-esa" desc="Electrostatic Analyser">
+ <dataset name="ion reduced" xml:id="THEMIS-thxxx:esa:peir" minSampling="3" rem_id="thxxx_l2_esa">
+ <parameter name="ion density" units="cm-3" xml:id="thxxx_peir_density"/>
+ <parameter name="ion v gse" units="km/s" size="3" labels="vx_gse,vy_gse,vz_gse" xml:id="thxxx_peir_velocity_gse"/>
+ <parameter name="ion temperature" units="eV" size="3" labels="t_para,t_perp1,t_perp2" xml:id="thxxx_peir_t3"/>
+ <parameter name="ion eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="32" xml:id="thxxx_peir_en_eflux"/>
+ <parameter name="sc_potential" units="V" xml:id="thxxx_peir_sc_pot"/>
+ </dataset>
+ <dataset name="electron reduced" xml:id="THEMIS-thxxx:esa:peer" minSampling="3" rem_id="thxxx_l2_esa">
+ <parameter name="elec density" units="cm-3" xml:id="thxxx_peer_density"/>
+ <parameter name="elec temperature" units="eV" size="3" labels="t_para,t_perp1,t_perp2" xml:id="thxxx_peer_t3"/>
+ <parameter name="elec eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="32" xml:id="thxxx_peer_en_eflux"/>
+ </dataset>
+ <dataset name="ion full" xml:id="THEMIS-thxxx:esa:peif" minSampling="96.27" maxSampling="385.1" rem_id="thxxx_l2_esa">
+ <parameter name="ion density" units="cm-3" xml:id="thxxx_peif_density"/>
+ <parameter name="ion v gse" units="km/s" size="3" labels="vx_gse,vy_gse,vz_gse" xml:id="thxxx_peif_velocity_gse"/>
+ <parameter name="ion temperature" units="eV" size="3" labels="t_para,t_perp1,t_perp2" xml:id="thxxx_peif_t3"/>
+ <parameter name="ion eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="32" xml:id="thxxx_peif_en_eflux"/>
+ <parameter name="sc_potential" units="V" xml:id="thxxx_peif_sc_pot"/>
+ </dataset>
+ <dataset name="ion burst" xml:id="THEMIS-thxxx:esa:peib" minSampling="3" rem_id="thxxx_l2_esa">
+ <parameter name="ion density" units="cm-3" xml:id="thxxx_peib_density"/>
+ <parameter name="ion eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="32" xml:id="thxxx_peib_en_eflux"/>
+ </dataset>
+ <dataset name="elec burst" xml:id="THEMIS-thxxx:esa:peeb" minSampling="3" rem_id="thxxx_l2_esa">
+ <parameter name="elec density" units="cm-3" xml:id="thxxx_peeb_density"/>
+ <parameter name="elec eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="32" xml:id="thxxx_peeb_en_eflux"/>
+ </dataset>
+ </instrument>
+ <instrument name="FGM" xml:id="THEMIS-xxx-fgm" desc="Fluxgate Magnetometer">
+ <dataset name="fgm high" xml:id="THEMIS-thxxx:fgm:high" minSampling="0.08" rem_id="thxxx_l2_fgm">
+ <parameter name="b gse" units="nT" size="3" labels="bx,by,bz" xml:id="thxxx_fgh_gse"/>
+ </dataset>
+ </instrument>
+ <instrument name="SST" xml:id="THEMIS-xxx-sst" desc="Solid State Telescope">
+ <dataset name="ions" xml:id="THEMIS-thxxx:sst:psif" minSampling="3" maxSampling="192" rem_id="thxxx_l2_sst">
+ <parameter name="ion eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="16" xml:id="thxxx_psif_en_eflux"/>
+ </dataset>
+ <dataset name="electrons" xml:id="THEMIS-thxxx:sst:psef" minSampling="3" maxSampling="192" rem_id="thxxx_l2_sst">
+ <parameter name="elec eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="16" xml:id="thxxx_psef_en_eflux"/>
+ </dataset>
+ </instrument>
+ </mission>
+</dataCenter>
diff --git a/info/REMOTEDATA/mapCDAWEB.xml b/info/REMOTEDATA/mapCDAWEB.xml
new file mode 100644
index 0000000..fb48aef
--- /dev/null
+++ b/info/REMOTEDATA/mapCDAWEB.xml
@@ -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>
diff --git a/src/REMOTEDATA/Bases.xml b/src/REMOTEDATA/Bases.xml
deleted file mode 100644
index 8e52ba3..0000000
--- a/src/REMOTEDATA/Bases.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<dataRoot xml:id="myRemoteData-treeRootNode">
- <dataCenter name="CDAWeb" desc="Coordinated_Data_Analysis" 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>
-
diff --git a/src/REMOTEDATA/ThemisConfigClass.php b/src/REMOTEDATA/ThemisConfigClass.php
index c3aa5e8..1d5c1a7 100644
--- a/src/REMOTEDATA/ThemisConfigClass.php
+++ b/src/REMOTEDATA/ThemisConfigClass.php
@@ -14,7 +14,7 @@ class ThemisConfigClass
public static $level = "l2";
public static $format = "cdf";
public static $themis = array('A'); //, 'B', 'C', 'D', 'E');
- public static $TemplateXml = "ThemisTreeTemplate.xml";
+ public static $TemplateXml = RemoteData."ThemisTreeTemplate.xml";
public static $START_YEAR = "2007";
public static $program = array('peim' => 'themis_esamom2nc', 'peem' => 'themis_esamom2nc',
'peif' => 'themis_esa2nc', 'peef' => 'themis_esa2nc',
diff --git a/src/REMOTEDATA/ThemisTreeTemplate.xml b/src/REMOTEDATA/ThemisTreeTemplate.xml
deleted file mode 100644
index 1a61f91..0000000
--- a/src/REMOTEDATA/ThemisTreeTemplate.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<dataCenter name="THEMIS" xml:id="THEMIS-IRAP" desc="Mirror IRAP Data Base">
- <mission name="THEMIS-XXX" xml:id="THEMIS-xxx" desc="THEMIS-XXX">
- <instrument name="ESA" xml:id="THEMIS-xxx-esa" desc="Electrostatic Analyser">
- <dataset name="ion reduced" xml:id="THEMIS-thxxx:esa:peir" minSampling="3" rem_id="thxxx_l2_esa">
- <parameter name="ion density" units="cm-3" xml:id="thxxx_peir_density"/>
- <parameter name="ion v gse" units="km/s" size="3" labels="vx_gse,vy_gse,vz_gse" xml:id="thxxx_peir_velocity_gse"/>
- <parameter name="ion temperature" units="eV" size="3" labels="t_para,t_perp1,t_perp2" xml:id="thxxx_peir_t3"/>
- <parameter name="ion eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="32" xml:id="thxxx_peir_en_eflux"/>
- <parameter name="sc_potential" units="V" xml:id="thxxx_peir_sc_pot"/>
- </dataset>
- <dataset name="electron reduced" xml:id="THEMIS-thxxx:esa:peer" minSampling="3" rem_id="thxxx_l2_esa">
- <parameter name="elec density" units="cm-3" xml:id="thxxx_peer_density"/>
- <parameter name="elec temperature" units="eV" size="3" labels="t_para,t_perp1,t_perp2" xml:id="thxxx_peer_t3"/>
- <parameter name="elec eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="32" xml:id="thxxx_peer_en_eflux"/>
- </dataset>
- <dataset name="ion full" xml:id="THEMIS-thxxx:esa:peif" minSampling="96.27" maxSampling="385.1" rem_id="thxxx_l2_esa">
- <parameter name="ion density" units="cm-3" xml:id="thxxx_peif_density"/>
- <parameter name="ion v gse" units="km/s" size="3" labels="vx_gse,vy_gse,vz_gse" xml:id="thxxx_peif_velocity_gse"/>
- <parameter name="ion temperature" units="eV" size="3" labels="t_para,t_perp1,t_perp2" xml:id="thxxx_peif_t3"/>
- <parameter name="ion eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="32" xml:id="thxxx_peif_en_eflux"/>
- <parameter name="sc_potential" units="V" xml:id="thxxx_peif_sc_pot"/>
- </dataset>
- <dataset name="ion burst" xml:id="THEMIS-thxxx:esa:peib" minSampling="3" rem_id="thxxx_l2_esa">
- <parameter name="ion density" units="cm-3" xml:id="thxxx_peib_density"/>
- <parameter name="ion eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="32" xml:id="thxxx_peib_en_eflux"/>
- </dataset>
- <dataset name="elec burst" xml:id="THEMIS-thxxx:esa:peeb" minSampling="3" rem_id="thxxx_l2_esa">
- <parameter name="elec density" units="cm-3" xml:id="thxxx_peeb_density"/>
- <parameter name="elec eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="32" xml:id="thxxx_peeb_en_eflux"/>
- </dataset>
- </instrument>
- <instrument name="FGM" xml:id="THEMIS-xxx-fgm" desc="Fluxgate Magnetometer">
- <dataset name="fgm high" xml:id="THEMIS-thxxx:fgm:high" minSampling="0.08" rem_id="thxxx_l2_fgm">
- <parameter name="b gse" units="nT" size="3" labels="bx,by,bz" xml:id="thxxx_fgh_gse"/>
- </dataset>
- </instrument>
- <instrument name="SST" xml:id="THEMIS-xxx-sst" desc="Solid State Telescope">
- <dataset name="ions" xml:id="THEMIS-thxxx:sst:psif" minSampling="3" maxSampling="192" rem_id="thxxx_l2_sst">
- <parameter name="ion eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="16" xml:id="thxxx_psif_en_eflux"/>
- </dataset>
- <dataset name="electrons" xml:id="THEMIS-thxxx:sst:psef" minSampling="3" maxSampling="192" rem_id="thxxx_l2_sst">
- <parameter name="elec eflux" display_type="spectrogram" units="eV/(cm^2-s-sr-eV)" size="16" xml:id="thxxx_psef_en_eflux"/>
- </dataset>
- </instrument>
- </mission>
-</dataCenter>
diff --git a/src/REMOTEDATA/makeProxy.php b/src/REMOTEDATA/makeProxy.php
index fd47111..be93526 100644
--- a/src/REMOTEDATA/makeProxy.php
+++ b/src/REMOTEDATA/makeProxy.php
@@ -44,8 +44,7 @@
$bases = $basesDom->getElementsByTagName("dataCenter");
if ($bases->length == 0)
exit('No Bases'.PHP_EOL);
-
-// $bases = array("CDAWEB");
+
$useSpase = true;
foreach ($bases as $base)
--
libgit2 0.21.2