CDPP / DDServer

Commit 9af6e03a4675b5f5589f9e5e8e57f25d277d48e6

Authored by Elena.Budnik
1 parent ef6a3cfa
Exists in master and in 9 other branches WIP, clean_real, create-user, epntap, evol_9042, fix-cdaweb, sqlite_test, time-in-double, ubuntu

config info separate dir

Showing 6 changed files with 54 additions and 4 deletions   Show diff stats
Inline Side-by-side
CMakeLists.txt
  Diff comments   View file @9af6e03
... ... @@ -86,6 +86,8 @@ install(DIRECTORY "src/DDSERVICES/SOAP/" DESTINATION DDService)
86 86 install(DIRECTORY "src/DDSERVICES/REST/" DESTINATION DDService)
87 87  
88 88 install(FILES "src/DECODERS/cdf2nc/cdf_to_netcdf_mapping.dat" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
89   -install(FILES "src/REMOTEDATA/Bases.xml" DESTINATION ${DDBASEINFO} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
  89 +
  90 +file(GLOB config_files "info/REMOTEDATA/*.xml")
  91 +install(FILES ${config_files} DESTINATION ${DDBASEINFO} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
90 92  
91 93 SET(CMAKE_VERBOSE_MAKEFILE ON)
... ...
src/REMOTEDATA/Bases.xml renamed to info/REMOTEDATA/Bases.xml
  Diff comments   View file @9af6e03
src/REMOTEDATA/ThemisTreeTemplate.xml renamed to info/REMOTEDATA/ThemisTreeTemplate.xml
  Diff comments   View file @9af6e03
info/REMOTEDATA/mapCDAWEB.xml 0 → 100644
  Diff comments   View file @9af6e03
... ... @@ -0,0 +1,49 @@
  1 +<?xml version="1.0"?>
  2 +<ALIASES>
  3 + <observatory xml:id='AC'>ACE</observatory>
  4 + <observatory xml:id='EQ'>EQUATOR-S</observatory>
  5 + <observatory xml:id="IMP-8">IMP8</observatory>
  6 + <observatory xml:id="I8">IMP8</observatory>
  7 + <observatory xml:id="G0">GOES_10</observatory>
  8 + <observatory xml:id="G10">GOES_10</observatory>
  9 + <observatory xml:id="G11">GOES_11</observatory>
  10 + <observatory xml:id="G12">GOES_12</observatory>
  11 + <observatory xml:id="CT">CL</observatory>
  12 + <observatory xml:id="PO">POLAR</observatory>
  13 + <observatory xml:id="IM">IMAGE</observatory>
  14 + <observatory xml:id="AHEAD">STA</observatory>
  15 + <observatory xml:id="BEHIND">STB</observatory>
  16 + <observatory xml:id="STEREOA">STA</observatory>
  17 + <observatory xml:id="STEREOB">STB</observatory>
  18 + <observatory xml:id="CRRES_SATELLITE">CRRES</observatory>
  19 + <observatory xml:id="RBSP-A-RBSPICE">RBSP-A</observatory>
  20 + <observatory xml:id="RBSP-B-RBSPICE">RBSP-B</observatory>
  21 + <observatory xml:id="RBSPA">RBSP-A</observatory>
  22 + <observatory xml:id="RBSPB">RBSP-B</observatory>
  23 + <instrument xml:id="SWI">SWICS</instrument>
  24 + <instrument xml:id="ULE">ULEIS</instrument>
  25 + <instrument xml:id='SEP'>SEPICA</instrument>
  26 + <instrument xml:id="FGM_SPIN">FGM</instrument>
  27 + <instrument xml:id="ECT-HOPE-SCI-L2">ECT</instrument>
  28 + <instrument xml:id="ECT-REPT-SCI-L2">ECT</instrument>
  29 + <instrument xml:id="ECT-MAGEIS-L2">ECT</instrument>
  30 + <instrument xml:id="MAGNETOMETER">EMFISIS</instrument>
  31 + <instrument xml:id="EMFISIS-L2">EMFISIS</instrument>
  32 + <instrument xml:id="EMFISIS-L3">EMFISIS</instrument>
  33 + <instrument xml:id="LEV-2">RBSPICE</instrument>
  34 + <instrument xml:id="EFW-L2">EFW</instrument>
  35 + <instrument xml:id="HFR-WAVEFORM">EMFISIS</instrument>
  36 + <instrument xml:id="WFR-WAVEFORM-CONTINUOUS-BURST">EMFISIS</instrument>
  37 + <instrument xml:id="SEPT>STEREO-A IMPACT/SEPT">SEPT</instrument>
  38 + <instrument xml:id="SEPT>STEREO-B IMPACT/SEPT">SEPT</instrument>
  39 + <instrument xml:id="SIT>STEREO-A IMPACT/SIT">SIT</instrument>
  40 + <instrument xml:id="SIT>STEREO-B IMPACT/SIT">SIT</instrument>
  41 + <instrument xml:id="LET>STEREO-A IMPACT/LET">LET</instrument>
  42 + <instrument xml:id="LET>STEREO-B IMPACT/LET">LET</instrument>
  43 + <instrument xml:id="STE>STEREO-A IMPACT/STE">STE</instrument>
  44 + <instrument xml:id="STE>STEREO-B IMPACT/STE">STE</instrument>
  45 + <instrument xml:id="SWEA_DISB>STEREO-A IMPACT/SWEA">SWEA</instrument>
  46 + <instrument xml:id="SWEA_DISB>STEREO-B IMPACT/SWEA">SWEA</instrument>
  47 + <instrument xml:id="SWEA_DIST>STEREO-A IMPACT/SWEA">SWEA</instrument>
  48 + <instrument xml:id="SWEA_DIST>STEREO-B IMPACT/SWEA">SWEA</instrument>
  49 +</ALIASES>
... ...
src/REMOTEDATA/ThemisConfigClass.php
  Diff comments   View file @9af6e03
... ... @@ -14,7 +14,7 @@ class ThemisConfigClass
14 14 public static $level = "l2";
15 15 public static $format = "cdf";
16 16 public static $themis = array('A'); //, 'B', 'C', 'D', 'E');
17   - public static $TemplateXml = "ThemisTreeTemplate.xml";
  17 + public static $TemplateXml = RemoteData."ThemisTreeTemplate.xml";
18 18 public static $START_YEAR = "2007";
19 19 public static $program = array('peim' => 'themis_esamom2nc', 'peem' => 'themis_esamom2nc',
20 20 'peif' => 'themis_esa2nc', 'peef' => 'themis_esa2nc',
... ...
src/REMOTEDATA/makeProxy.php
  Diff comments   View file @9af6e03
... ... @@ -44,8 +44,7 @@
44 44 $bases = $basesDom->getElementsByTagName("dataCenter");
45 45 if ($bases->length == 0)
46 46 exit('No Bases'.PHP_EOL);
47   -
48   -// $bases = array("CDAWEB");
  47 +
49 48 $useSpase = true;
50 49  
51 50 foreach ($bases as $base)
... ...