CDPP / AMDA_Integration

Commit 5e96a728b9862bd5974b449a6c0557741c5e7427

Authored by elena
2 parents 01ff2cc6 1815c314
Exists in master and in 66 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

merge during pull before push branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_Integration

Showing 3 changed files with 59 additions and 14 deletions   Show diff stats
Inline Side-by-side
config/AMDAIntegrationConfig.php
  Diff comments   View file @5e96a72
... ... @@ -83,6 +83,25 @@ switch ($localIP)
83 83 define('IHM_SRC_DIR', '/home/benjamin/AMDA-GIT/AMDA_IHM/');
84 84  
85 85 break;
  86 + case '10.121.1.121' :
  87 + define('PLATFORM_NAME','pc1121 dev plaform');
  88 +
  89 + //AKKA - Force the IP client value to prevent a bug with DDServer
  90 + // The IP client must be write with the pattern : xxx.xxx.xxx.xxx
  91 + define('FORCE_CLIENT_IP', '010.121.001.121');
  92 +
  93 + // true for AKKA
  94 + // false or not defined for IRAP
  95 + // It's used to select the correct SVN path for depotInfo repository
  96 + //define('AKKA_SVN', 'true');
  97 +
  98 + //Path to AMDA_Kernel base dir
  99 + define('NEWKERNEL_BASE_PATH', '/home/myriam/workspacenew/AMDA_Kernel/');
  100 +
  101 + //Path to AMDA_IHM base dir
  102 + define('IHM_SRC_DIR', '/home/myriam/workspacenew/AMDA_IHM/');
  103 +
  104 + break;
86 105 }
87 106  
88 107  
... ...
src/InputOutput/IHMImpl/Params/DownloadImpl/IHMInputOutputParamsDownloadClass.php
  Diff comments   View file @5e96a72
... ... @@ -27,31 +27,43 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas
27 27 $outputsNode = $this->paramsData->getRequestNode()->getOutputsNode();
28 28 $downloadNode = $outputsNode->addNewOutput(RequestOutputTypeEnum::DOWNLOAD);
29 29  
30   - //timeformatData : [['Y-m-dTH:i:s', 'YYYY-MM-DDThh:mm:ss'], ['Y m d H i s', 'YYYY MM DD hh mm ss'], ['d m Y H i s', 'DD MM YYYY hh mm ss'], ['Y z H i s', 'YYYY DDD hh mm ss']],
  30 + //timeformatData : [['Y-m-dTH:i:s', 'YYYY-MM-DDThh:mm:ss'], ['DD Time', 'DD Time'], ['Timestamp', 'Timestamp']],
31 31 switch ($input->timeformat)
32 32 {
33 33 case 'YYYY-MM-DDThh:mm:ss' :
34 34 $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::ISO);
35 35 break;
  36 + case 'DD Time' :
  37 + $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::DDTIME);
  38 + break;
  39 + case 'Timestamp' :
  40 + $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::TIMESTAMP);
  41 + break;
36 42 default :
37 43 throw new Exception('Time format not implemented.');
38 44 }
39 45  
40   - //formatData : [['ASCII', 'ASCII'],['vot', 'VOTable']],
  46 + //formatData : [['ASCII', 'ASCII'],['vot', 'VOTable'],['cdf', 'CDF'],['json', 'JSON']],
41 47 switch ($input->fileformat)
42 48 {
43 49 case "ASCII" :
44 50 $downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::ASCII);
45 51 break;
46   - case "vot" :
47   - $downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::VOTABLE);
  52 + case "vot" :
  53 + $downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::VOTABLE);
  54 + break;
  55 + case "cdf" :
  56 + $downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::CDF);
  57 + break;
  58 + case "json" :
  59 + $downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::JSON);
48 60 break;
49 61 default :
50 62 throw new Exception('File format not implemented.');
51 63 }
52 64  
53   - if ($input->output != "")
54   - $downloadNode->setFileName($input->output);
  65 + if ($input->fileprefix != "")
  66 + $downloadNode->setFileName($input->fileprefix);
55 67  
56 68 //add params to output
57 69 foreach ($input->list as $param)
... ... @@ -65,12 +77,22 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas
65 77 switch ($input->structure)
66 78 {
67 79 case "0" :
68   - $downloadNode->setSamplingTime($input->sampling);
69   - $downloadNode->setStructure(RequestOutputDownloadStructureEnum::ONE_FILE);
  80 + if (!$input->refparamSampling)
  81 + {
  82 + $downloadNode->setSamplingTime($input->sampling);
  83 + $downloadNode->setStructure(RequestOutputDownloadStructureEnum::ONE_FILE);
  84 + }
  85 + else
  86 + $downloadNode->setStructure(RequestOutputDownloadStructureEnum::ONE_FILE_REFPARAM);
70 87 break;
71 88 case "1" :
72   - $downloadNode->setSamplingTime($input->sampling);
73   - $downloadNode->setStructure(RequestOutputDownloadStructureEnum::ONE_FILE_PER_INTERVAL);
  89 + if (!$input->refparamSampling)
  90 + {
  91 + $downloadNode->setSamplingTime($input->sampling);
  92 + $downloadNode->setStructure(RequestOutputDownloadStructureEnum::ONE_FILE_PER_INTERVAL);
  93 + }
  94 + else
  95 + $downloadNode->setStructure(RequestOutputDownloadStructureEnum::ONE_FILE_PER_INTERVAL_REFPARAM);
74 96 break;
75 97 case "2" :
76 98 $downloadNode->setStructure(RequestOutputDownloadStructureEnum::ONE_FILE_PER_PARAMETER_PER_INTERVAL);
... ... @@ -116,4 +138,4 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas
116 138 return $this->commonMarshallResult($data,DOWNLOAD_RESULT_FILE_KEY);
117 139 }
118 140 }
119   -?>
120 141 \ No newline at end of file
  142 +?>
... ...
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputDownloadNodeClass.php
  Diff comments   View file @5e96a72
... ... @@ -17,8 +17,10 @@ define ("REQUESTOUTPUTDOWNLOADPARAM_CALIB", "calibration_info");
17 17  
18 18 abstract class RequestOutputDownloadTimeFormatEnum
19 19 {
20   - const UNKNOWN = "";
21   - const ISO = "ISO";
  20 + const UNKNOWN = "";
  21 + const ISO = "ISO";
  22 + const DDTIME = "DD";
  23 + const TIMESTAMP = "DOUBLE";
22 24 }
23 25  
24 26 abstract class RequestOutputDownloadFileFormatEnum
... ... @@ -26,6 +28,8 @@ abstract class RequestOutputDownloadFileFormatEnum
26 28 const UNKNOWN = "";
27 29 const ASCII = "ASCII";
28 30 const VOTABLE = "VOT";
  31 + const CDF = "CDF";
  32 + const JSON = "JSON";
29 33 }
30 34  
31 35 abstract class RequestOutputDownloadStructureEnum
... ... @@ -230,4 +234,4 @@ class RequestOutputDownloadNodeClass extends NodeClass
230 234 }
231 235 }
232 236  
233   -?>
234 237 \ No newline at end of file
  238 +?>
... ...