CDPP / AMDA_Integration

Commit 761d977c74ba0cb56a0e1d7d54878293c294fc61

Authored by Hacene SI HADJ MOHAND
2 parents dfb9cd0d 20263d07
Exists in master and in 44 other branches 10098, 5390, 7616, 8528, 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, amdadev, anr_tempete, cu2022, density_maps, develop, master_vge, mlplasmas, test-merge, ws_get_catalog

Merge branch 'rm_6912' into develop

Showing 4 changed files with 9 additions and 0 deletions   Show diff stats
Inline Side-by-side
.gitignore
  Diff comments   View file @761d977
1 1 config/current.env
2 2 .project
3 3 .idea
  4 +/nbproject/private/
4 5 \ No newline at end of file
... ...
src/InputOutput/IHMImpl/TimeTables/IHMInputOutputConvertTTClass.php
  Diff comments   View file @761d977
... ... @@ -38,6 +38,9 @@ class IHMInputOutputConvertTTClass implements InputOutputInterface
38 38 case 'INTERNAL':
39 39 $processData->setInputFileFormat(TTRequestFileFormatEnum::INTERNAL);
40 40 break;
  41 + case 'SPACE':
  42 + $processData->setInputFileFormat(TTRequestFileFormatEnum::SPACE);
  43 + break;
41 44 default:
42 45 throw new Exception('Unknown input format');
43 46 }
... ...
src/InputOutput/IHMImpl/TimeTables/IHMInputOutputTTClass.php
  Diff comments   View file @761d977
... ... @@ -72,6 +72,7 @@ class IHMInputOutputTTClass implements InputOutputInterface
72 72 $outputName = $tt->name.'.xml';
73 73 break;
74 74 case TTRequestFileFormatEnum::ASCII :
  75 + case TTRequestFileFormatEnum:: SPACE :
75 76 $outputName = $tt->name.'.txt';
76 77 break;
77 78 default :
... ... @@ -148,6 +149,9 @@ class IHMInputOutputTTClass implements InputOutputInterface
148 149 case 'txt':
149 150 case 'asc':
150 151 return TTRequestFileFormatEnum::ASCII;
  152 + case 'space':
  153 + case 'SPACE':
  154 + return TTRequestFileFormatEnum::SPACE;
151 155 }
152 156 return TTRequestFileFormatEnum::INTERNAL;
153 157 }
... ...
src/Request/TTRequestImpl/TTRequestDataClass.php
  Diff comments   View file @761d977
... ... @@ -16,6 +16,7 @@ abstract class TTRequestFileFormatEnum
16 16 const ASCII = "ASCII";
17 17 const VOTABLE = "VO";
18 18 const INTERNAL = "Internal";
  19 + const SPACE = "SPACE";
19 20 }
20 21  
21 22 /**
... ...