CDPP / AMDA_IHM

Commit c1590d8f44bc34097f0f9175c70c0241a2a766d6

Authored by Myriam Bouchemit
2 parents 715ccfee bc0f89a8
Exists in master and in 95 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, akkodis/amdadev, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, 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

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

Showing 4 changed files with 100 additions and 2 deletions   Show diff stats
Inline Side-by-side
php/classes/CatalogCacheIntervalObject.php
  Diff comments   View file @c1590d8
... ... @@ -68,7 +68,7 @@ class CatalogCacheIntervalObject extends TimeTableCacheIntervalObject
68 68 }
69 69 break;
70 70 case 3: //int
71   - fwrite($handle,pack('L', intval($value)));
  71 + fwrite($handle,pack('l', intval($value)));
72 72 break;
73 73 default: // not defined => string
74 74 fwrite($handle,pack('L', strlen($value)));
... ... @@ -121,7 +121,7 @@ class CatalogCacheIntervalObject extends TimeTableCacheIntervalObject
121 121  
122 122 break;
123 123 case 3: //int
124   - if (!$res = unpack('Lval',fread($handle,4))) {
  124 + if (!$res = unpack('lval',fread($handle,4))) {
125 125 break;
126 126 }
127 127 $val = $res['val'];
... ...
update_amda/correctNan.php 0 → 100644
  Diff comments   View file @c1590d8
... ... @@ -0,0 +1,38 @@
  1 +<?php
  2 +
  3 + define("AMDA_INTERNAL_METADATA",getenv("AMDAINTERNALDIR"));
  4 +
  5 + $info = new DomDocument("1.0");
  6 + // $infoName = $argv[1];
  7 + $pattern = "info_psp_loic_*.xml";
  8 + foreach (glob(AMDA_INTERNAL_METADATA."/PARAM_INFO_PREDEFINED/".$pattern) as $infoName) {
  9 + $info->load($infoName);
  10 +
  11 + $dimensions = $info->getElementsByTagName("dimensions")->item(0);
  12 +
  13 + $dim_1 = $dimensions->getAttribute("dim_1");
  14 + $dim_2 = null;
  15 + if ($dimensions->hasAttribute("dim_2"))
  16 + $dim_2 = $dimensions->getAttribute("dim_2");
  17 +
  18 +
  19 + $tables = $info->getElementsByTagName("table");
  20 +
  21 + foreach ($tables as $table) {
  22 + $channels = $table->getElementsByTagName("channel");
  23 + $dim = $table->getAttribute("relatedDim");
  24 + if ( $dim == "dim_1" ) $dim_ = $dim_1;
  25 + if ( $dim == "dim_2" ) $dim_ = $dim_2;
  26 + if ($dim_ != $channels->length) {
  27 + $dimensions->setAttribute($dim, $channels->length);
  28 + echo $infoName.PHP_EOL;
  29 + echo $dim_." ".$channels->length.PHP_EOL;
  30 + }
  31 + }
  32 + $info->save($infoName);
  33 + }
  34 +
  35 +?>
  36 +
  37 +
  38 +
... ...
update_amda/cp2amda
  Diff comments   View file @c1590d8
... ... @@ -43,6 +43,7 @@ cp $NEWMETA/final/*.xml $PARAMS_LOCALDB_DIR
43 43 # if internal parameters not shown in the tree exist => copy them to AMDA Installation without processing
44 44 if [ -d "$AMDAINTERNALDIR/INTERNAL_PARAM_DEF" ]; then
45 45 cp $AMDAINTERNALDIR/INTERNAL_PARAM_DEF/* $PARAMS_LOCALDB_DIR
  46 + #cp $AMDAINTERNALDIR/INTERNAL_PARAM_DEF/*.xml $NEWMETA/final
46 47 fi
47 48  
48 49 # if special help exitsts => copy it to NEWMETA
... ...
update_amda/remakeInfo.php 0 → 100644
  Diff comments   View file @c1590d8
... ... @@ -0,0 +1,59 @@
  1 +<?php
  2 +
  3 + function remove_children(&$node) {
  4 + while ($node->firstChild) {
  5 + while ($node->firstChild->firstChild) {
  6 + remove_children($node->firstChild);
  7 + }
  8 + $node->removeChild($node->firstChild);
  9 + }
  10 + }
  11 +
  12 + define("NEWMETA",getenv("NEWMETA"));
  13 + define("AMDA_INTERNAL_METADATA",getenv("AMDAINTERNALDIR"));
  14 +
  15 + $pattern = "info_psp_om*.xml";
  16 + $info = new DomDocument("1.0");
  17 +
  18 + // $infoName = $argv[1];
  19 + foreach (glob(NEWMETA."/ParamInfo/".$pattern) as $infoName) {
  20 +
  21 + $info->load($infoName);
  22 + $dimensions = $info->getElementsByTagName("dimensions")->item(0);
  23 +
  24 + if ($dimensions->hasAttribute("dim_2") && $dimensions->getAttribute("dim_2") == "1")
  25 + $dimensions->removeAttribute("dim_2");
  26 +
  27 + $components = $info->getElementsByTagName("components");
  28 + if ($components->length == 0) continue;
  29 + if ( !$components->item(0)->hasChildNodes() ) continue; // has been already processed
  30 + $a=$components->item(0);
  31 + remove_children($a);
  32 +
  33 + $channels = $info->getElementsByTagName("channel");
  34 + foreach ($channels as $channel) {
  35 + $min = $channel->getAttribute("min");
  36 + $max = $channel->getAttribute("max");
  37 +
  38 + if ( $min == "nan" ) {
  39 + $channel->setAttribute("min", "-");
  40 + }
  41 + if ( $max== "nan" ) {
  42 + $channel->setAttribute("max", "-");
  43 + }
  44 + if (is_numeric($min))
  45 + $channel->setAttribute("min",number_format($min,1,".",""));
  46 + if (is_numeric($max))
  47 + $channel->setAttribute("max",number_format($max,1,".",""));
  48 +
  49 + }
  50 + echo basename($infoName).PHP_EOL;
  51 + $info->save(AMDA_INTERNAL_METADATA."/PARAM_INFO_PREDEFINED/".basename($infoName));
  52 + }
  53 +
  54 +?>
  55 +
  56 +
  57 +
  58 +
  59 +
... ...