CDPP / AMDA_Integration

Commit 2995a006f56ce930c53bda5b030c2172c83ce274

Authored by Benjamin Renard
1 parent 43b2304e
Exists in master and in 18 other branches FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6951, FER_7618, FER_9629, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_11362, MAZ_FIX_9016, SpeasyGet, amdadev, develop

Add CDF_ISTP format for WS

Showing 2 changed files with 11 additions and 6 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/WSImpl/Params/DownloadImpl/WSInputOutputParamsDownloadClass.php
  Diff comments   View file @2995a00
@@ -63,7 +63,11 @@ class WSInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClass @@ -63,7 +63,11 @@ class WSInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClass
63 case "CDF" : 63 case "CDF" :
64 $downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::CDF); 64 $downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::CDF);
65 $formatExtension = ".cdf"; 65 $formatExtension = ".cdf";
66 - break; 66 + break;
  67 + case "CDF_ISTP" :
  68 + $downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::CDF_ISTP);
  69 + $formatExtension = ".cdf";
  70 + break;
67 case "ASCII" : 71 case "ASCII" :
68 $downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::ASCII); 72 $downloadNode->setFileFormat(RequestOutputDownloadFileFormatEnum::ASCII);
69 $formatExtension = ".txt"; 73 $formatExtension = ".txt";
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputDownloadNodeClass.php
  Diff comments   View file @2995a00
@@ -28,11 +28,12 @@ abstract class RequestOutputDownloadTimeFormatEnum @@ -28,11 +28,12 @@ abstract class RequestOutputDownloadTimeFormatEnum
28 28
29 abstract class RequestOutputDownloadFileFormatEnum 29 abstract class RequestOutputDownloadFileFormatEnum
30 { 30 {
31 - const UNKNOWN = "";  
32 - const ASCII = "ASCII";  
33 - const VOTABLE = "VOT";  
34 - const CDF = "CDF";  
35 - const JSON = "JSON"; 31 + const UNKNOWN = "";
  32 + const ASCII = "ASCII";
  33 + const VOTABLE = "VOT";
  34 + const CDF = "CDF";
  35 + const CDF_ISTP = "CDF_ISTP";
  36 + const JSON = "JSON";
36 } 37 }
37 38
38 abstract class RequestOutputDownloadStructureEnum 39 abstract class RequestOutputDownloadStructureEnum