CDPP / AMDA_IHM

Commit 1577b1e708e7487ba4ba04077e71badbc025d3a0

Authored by Benjamin Renard
1 parent 986749f3
Exists in master and in 93 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, frames-transformation, hapi, master_vge, mlplasmas, multiplot, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Fix for HAPI server (#6318)

Showing 5 changed files with 46 additions and 14 deletions   Show diff stats
Inline Side-by-side
.gitignore
  Diff comments   View file @1577b1e
... ... @@ -19,3 +19,4 @@ php/log
19 19 _test*
20 20 *.idea
21 21 /nbproject/
  22 +nohup.out
... ...
php/hapi/getData.php
  Diff comments   View file @1577b1e
... ... @@ -102,7 +102,7 @@ while(1)
102 102 $exploded_data = explode(' ', $data_line);
103 103 $data = array();
104 104 foreach ($exploded_data as $d) {
105   - if (!empty($d)) {
  105 + if ($d != "") {
106 106 $data[] = $d;
107 107 }
108 108 }
... ...
scripts/run-hapi-server.sh
  Diff comments   View file @1577b1e
... ... @@ -6,4 +6,5 @@ export AMDA_IHM="$SCRIPTDIR/.."
6 6 . $SCRIPTDIR/loadEnv.sh
7 7  
8 8 cd $SCRIPTDIR
9   -node $HAPISERVER_PATH/server.js --conf $HAPIData/conf/server.json --file $HAPIData/metadata/amda.json
  9 +rm -f nohup.out
  10 +nohup node $HAPISERVER_PATH/server.js --conf $HAPIData/conf/server.json --file $HAPIData/metadata/amda.json &
... ...
update_amda/makeHAPIMetadata.php
  Diff comments   View file @1577b1e
... ... @@ -12,15 +12,45 @@ $doc = new DOMDocument();
12 12  
13 13 $xpath = new DOMXpath($doc);
14 14  
15   -$dataset_nodes = $xpath->query("/dataRoot/dataCenter/mission/instrument/dataset");
  15 +$dataset_nodes = $xpath->query("/dataRoot/dataCenter/mission/instrument/dataset | /dataRoot/dataCenter/mission/observatory/instrument/dataset");
16 16 $datasets = array();
17 17 foreach ($dataset_nodes as $dataset_node) {
  18 + $datasetId = $dataset_node->getAttribute("xml:id");
  19 + if (empty($datasetId)) {
  20 + echo "[WARNING] Cannot retrieve dataset id".PHP_EOL;
  21 + continue;
  22 + }
  23 +
  24 + //Dataset start date
  25 + $startDate = $dataset_node->getAttribute("dataStart");
  26 + if (empty($startDate)) {
  27 + echo "[WARNING] Cannot retrieve start date for ".$datasetId.PHP_EOL;
  28 + continue;
  29 + }
  30 + if ($startDate == 'MissionDependent') {
  31 + echo "[WARNING] Dataset ".$datasetId." is mission dependant => Skip this dataset".PHP_EOL;
  32 + continue;
  33 + }
  34 + if ($startDate[strlen($startDate)-1] != 'Z') {
  35 + $startDate .= 'Z';
  36 + }
  37 +
  38 + //Dataset stop date
  39 + $stopDate = $dataset_node->getAttribute("dataStop");
  40 + if (empty($stopDate)) {
  41 + echo "[WARNING] Cannot retrieve stop date for ".$datasetId.PHP_EOL;
  42 + continue;
  43 + }
  44 + if ($stopDate[strlen($stopDate)-1] != 'Z') {
  45 + $stopDate .= 'Z';
  46 + }
  47 +
18 48 $dataset = array(
19   - "id" => $dataset_node->getAttribute("xml:id"),
  49 + "id" => $datasetId,
20 50 "title" => $dataset_node->getAttribute("name"),
21 51 "info" => (Object)array(
22   - "startDate" => $dataset_node->getAttribute("dataStart"),
23   - "stopDate" => $dataset_node->getAttribute("dataStop"),
  52 + "startDate" => $startDate,
  53 + "stopDate" => $stopDate,
24 54 ),
25 55 );
26 56  
... ...
update_amda/updateAmda
  Diff comments   View file @1577b1e
... ... @@ -92,10 +92,6 @@
92 92 $UPDATEDIR/cp2amda
93 93 echo "copy 2 amda : done"
94 94  
95   - echo "making HAPI metadata..."
96   - php $UPDATEDIR/makeHAPIMetadata.php
97   - echo "make HAPI metadata : done"
98   -
99 95 echo "making Orbits..."
100 96 $UPDATEDIR/makeOrbits
101 97 echo "make Orbits : done"
... ... @@ -104,6 +100,10 @@
104 100 if [ -d $RemoteData/PARAMS ]; then
105 101 cp $RemoteData/PARAMS/* $PARAMS_LOCALDB_DIR/
106 102 fi
  103 +
  104 + echo "making HAPI metadata..."
  105 + php $UPDATEDIR/makeHAPIMetadata.php
  106 + echo "make HAPI metadata : done"
107 107 fi
108 108 # Update StartStop & Help only
109 109 if [ $UPDATE ]
... ... @@ -134,13 +134,13 @@
134 134 fi
135 135 echo 'copy 2 amda : done'
136 136  
137   - echo "making HAPI metadata..."
138   - php $UPDATEDIR/makeHAPIMetadata.php
139   - echo "make HAPI metadata : done"
140   -
141 137 echo "updating OrbitsInfo..."
142 138 php $AMDA_IHM/php/RemoteDataCenter/makeOrbitsInfo.php
143 139 echo "update OrbitsInfo : done"
  140 +
  141 + echo "making HAPI metadata..."
  142 + php $UPDATEDIR/makeHAPIMetadata.php
  143 + echo "make HAPI metadata : done"
144 144 fi
145 145  
146 146 if [ $PARAM_INFO ]
... ...