CDPP / AMDA_IHM

Commit ff8c764d35834bf51a4e8b458da7d6090165345f

Authored by Benjamin Renard
1 parent f5df7de1
Exists in master and in 91 other branches 10098, 10178, 5390, 6629, 6728, 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, 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

Add datasetGroup support for HAPI + decode html entities for units

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
Inline Side-by-side
update_amda/makeHAPIMetadata.php
  Diff comments   View file @ff8c764
... ... @@ -12,7 +12,7 @@ $doc = new DOMDocument();
12 12  
13 13 $xpath = new DOMXpath($doc);
14 14  
15   -$dataset_nodes = $xpath->query("/dataRoot/dataCenter/mission/instrument/dataset | /dataRoot/dataCenter/mission/observatory/instrument/dataset");
  15 +$dataset_nodes = $xpath->query("/dataRoot/dataCenter/mission/instrument/dataset | /dataRoot/dataCenter/mission/observatory/instrument/dataset | /dataRoot/dataCenter/mission/instrument/datasetGroup/dataset");
16 16 $datasets = array();
17 17 foreach ($dataset_nodes as $dataset_node) {
18 18 $datasetId = $dataset_node->getAttribute("xml:id");
... ... @@ -175,7 +175,7 @@ foreach ($dataset_nodes as $dataset_node) {
175 175 if (!empty($ranges)) {
176 176 $bin_info = (Object)array();
177 177 $bin_info->{"name"} = $nameBin;
178   - $bin_info->{"units"} = $unitsBin;
  178 + $bin_info->{"units"} = html_entity_decode($unitsBin);
179 179 $bin_info->{"ranges"} = $ranges;
180 180 if ($bin_index == 0) {
181 181 array_unshift($bins, $bin_info);
... ... @@ -196,7 +196,7 @@ foreach ($dataset_nodes as $dataset_node) {
196 196 $units = $parameter_node->getAttribute("units");
197 197 if (empty($units))
198 198 $units = NULL;
199   - $parameter->{"units"} = $units;
  199 + $parameter->{"units"} = html_entity_decode($units);
200 200  
201 201 //fill
202 202 $parameter->{"fill"} = "-1e31";
... ...