CDPP / AMDA_IHM

Commit 189c51a1715902f2edabde48b506636af94ae4a2

Authored by Elena.Budnik
1 parent 22dd7e8c
Exists in master and in 112 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, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

preprocessInfo

Showing 5 changed files with 64 additions and 9 deletions   Show diff stats
Inline Side-by-side
update_amda/cleanNewMetaLight
  Diff comments   View file @189c51a
... ... @@ -3,7 +3,7 @@
3 3 if test $NEWMETA
4 4 then
5 5  
6   - for Dir in $(find -L $NEWMETA/* -type d -not -path *ParamInfo* )
  6 + for Dir in $(find -L $NEWMETA/* -type d -not -path $NEWMETA/ParamInfo* )
7 7 do
8 8 rm ${Dir}/*
9 9 done
... ...
update_amda/cp2amda
  Diff comments   View file @189c51a
... ... @@ -18,13 +18,14 @@ if [ -e $AMDAINTERNALDIR/ParamTemplateList.xml ]; then
18 18 mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
19 19 fi
20 20  
21   - cp $NEWMETA/final/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
22   -
23 21 # if internal parameters not shown in the tree exist => copy them
24 22 if [ -d $AMDAINTERNALDIR/INTERNAL_PARAM_DEF ]
25 23 then
26   - cp $AMDAINTERNALDIR/INTERNAL_PARAM_DEF/* $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
  24 + cp $AMDAINTERNALDIR/INTERNAL_PARAM_DEF/* $NEWMETA/final/
27 25 fi
  26 +
  27 + cp $NEWMETA/final/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
  28 +
28 29  
29 30 # if special help exitsts => copy it
30 31 if [ -d $AMDAINTERNALDIR/HELP_PREDEFINED ]
... ...
update_amda/generate_param_info
  Diff comments   View file @189c51a
... ... @@ -21,9 +21,23 @@ fi
21 21 # to avoid not needed calculations
22 22  
23 23 if [ -d $AMDAINTERNALDIR/PARAM_INFO_PREDEFINED ]; then
24   - cp $AMDAINTERNALDIR/PARAM_INFO_PREDEFINED/info*.xml $NEWMETA/ParamInfo
  24 + cp $AMDAINTERNALDIR/PARAM_INFO_PREDEFINED/info*.xml $PARAM_INFO_PATH
25 25 fi
26 26  
  27 +for param_file in $NEWMETA/final/*.xml
  28 +do
  29 + param_filename=$(basename "${param_file%.*}")
  30 + info_file=info_${param_filename}.xml
  31 +
  32 + if [ -e $PARAM_INFO_PATH/$info_file ]
  33 + then
  34 + echo ${param_filename} exists
  35 + else
  36 + echo "Generate info file for ${param_filename}"
  37 + php $UPDATEDIR/preprocessInfo.php ${param_filename}
  38 + fi
  39 +done
  40 +
27 41 #modif in app.properties
28 42 if [ ! -e ./app.properties ]; then
29 43 echo "No app.properties file !!!"
... ... @@ -79,17 +93,17 @@ do
79 93 echo "Generate info file for ${param_filename}"
80 94 amdaParameterInfo -p ${param_filename}
81 95 if [ $? -eq 0 ]; then
82   - mv $info_file $NEWMETA/ParamInfo
  96 + mv $info_file $PARAM_INFO_PATH
83 97 fi
84 98 fi
85   -done;
  99 +done
86 100  
87 101 # copy info for parameter arguments
88 102 if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo ]; then
89 103 mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
90 104 fi
91 105  
92   -cp $NEWMETA/ParamInfo/info*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
  106 +cp $PARAM_INFO_PATH/info*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
93 107  
94 108 cd ${CRT_PWD}
95 109  
... ...
update_amda/preprocessInfo.php 0 → 100644
  Diff comments   View file @189c51a
... ... @@ -0,0 +1,40 @@
  1 +<?php
  2 +/**
  3 +*
  4 +*/
  5 + $id = $argv[1];
  6 + $NEWMETA = getenv('NEWMETA');
  7 +
  8 + $infoXml = new DomDocument("1.0");
  9 + $infoXml->load($NEWMETA."final/$id.xml");
  10 +
  11 + $infoBlock = $infoXml->getElementsByTagName('info')->item(0);
  12 + $components = $infoBlock->getElementsByTagName('components')->item(0);
  13 +
  14 + if ($components->nodeValue != "") {
  15 +
  16 + echo "COMP ".$components->nodeValue.PHP_EOL;
  17 + $comps = explode(',',$components->nodeValue);
  18 +
  19 + if (count($comps) == 3) {
  20 + $argsXml = new DomDocument("1.0");
  21 + $root = $argsXml->createElement('paraminfo');
  22 + $root->setAttribute('xml:id',$id);
  23 + $dim = $argsXml->createElement('dimensions');
  24 + $dim->setAttribute('dim_1',3);
  25 + $dim->setAttribute('dim_2',1);
  26 + $root->appendChild($dim);
  27 + $cmps = $argsXml->createElement('components');
  28 + $root->appendChild($cmps);
  29 + for ($i = 0; $i < count($comps); $i++) {
  30 + $cmp = $argsXml->createElement('component');
  31 + $cmp->setAttribute('index_1',$i);
  32 + $cmp->setAttribute('name',$comps[$i]);
  33 + $cmps->appendChild($cmp);
  34 + }
  35 +
  36 + $argsXml->appendChild($root);
  37 + $argsXml->save($NEWMETA."ParamInfo/info_$id.xml");
  38 + }
  39 + }
  40 +?>
0 41 \ No newline at end of file
... ...
update_amda/updateAmda
  Diff comments   View file @189c51a
... ... @@ -3,7 +3,7 @@
3 3 # --install | -i ; --update-internal | -u ; --with-remote | -r ; --generate-param-args | -a ; -update-param-args | -p ;
4 4 # --spase-synchro | -s ; --clean-new-meta | -c ; --help | -h;
5 5  
6   - UPDATEDIR=`pwd`/$(dirname "$0")
  6 + export UPDATEDIR=`pwd`/$(dirname "$0")
7 7 . $UPDATEDIR/updateEnv.sh
8 8  
9 9 for option in $@
... ...