diff --git a/src/InputOutput/IHMImpl/Params/DownloadImpl/IHMInputOutputParamsDownloadClass.php b/src/InputOutput/IHMImpl/Params/DownloadImpl/IHMInputOutputParamsDownloadClass.php index 70b4936..93c1186 100644 --- a/src/InputOutput/IHMImpl/Params/DownloadImpl/IHMInputOutputParamsDownloadClass.php +++ b/src/InputOutput/IHMImpl/Params/DownloadImpl/IHMInputOutputParamsDownloadClass.php @@ -15,7 +15,7 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas */ protected function unmarshallRequest($input) { - //{"nodeType":"download","type":"Download","downloadSrc":"0","structure":"2","sampling":600,"output":"", + //{"nodeType":"download","type":"Download","downloadSrc":"0","structure":"2","sampling":600,"separateInfoFile":false,"output":"", // "header":"0","timesrc":"TimeTable","timeTables":[{"timeTableName":"rzerzer","id":"tt_1"},{"timeTableName":"sqsdq","id":"tt_0"}], //"list":["dst"],"milli":false,"fileformat":"ASCII","timeformat":"YYYY-MM-DDThh:mm:ss","compression":"tar+gzip","leaf":true} @@ -121,6 +121,9 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas throw new Exception('Structure type not implemented.'); } + //separateInfoFile + $downloadNode->setSeparateInfoFile(isset($input->separateInfoFile) ? $input->separateInfoFile : FALSE); + //filecompressData : [['zip', 'zip'], ['tar+gzip', 'tar+gzip']], $extension = ""; $resultFilePrefix = ""; diff --git a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputDownloadNodeClass.php b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputDownloadNodeClass.php index 8481404..0be3c7b 100644 --- a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputDownloadNodeClass.php +++ b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputDownloadNodeClass.php @@ -8,6 +8,7 @@ define ("REQUESTOUTPUTDOWNLOAD_FILEFORMAT", "fileFormat"); define ("REQUESTOUTPUTDOWNLOAD_FILENAME", "fileName"); define ("REQUESTOUTPUTDOWNLOAD_SAMPLING", "timeResolution"); define ("REQUESTOUTPUTDOWNLOAD_STRUCTURE", "outputStructure"); +define ("REQUESTOUTPUTDOWNLOAD_SEPARATEINFOGILE", "separateInfoFile"); define ("REQUESTOUTPUTDOWNLOAD_PRECISION", "precision"); define ("REQUESTOUTPUTDOWNLOADPARAM_NAME", "param"); @@ -199,6 +200,18 @@ class RequestOutputDownloadNodeClass extends NodeClass return (($node == NULL) ? RequestOutputDownloadStructureEnum::UNKNOWN : $node->getValue()); } + public function setSeparateInfoFile($separateInfoFile) + { + $node = $this->getChildInstanceByName(REQUESTOUTPUTDOWNLOAD_STRUCTURE, true); + $node->setAttribute(REQUESTOUTPUTDOWNLOAD_SEPARATEINFOGILE, $separateInfoFile ? "true" : "false"); + } + + public function getSeparateInfoFile() + { + $node = $this->getChildInstanceByName(REQUESTOUTPUTDOWNLOAD_STRUCTURE); + return (($node == NULL) ? FALSE : ($node->getAttribute(REQUESTOUTPUTDOWNLOAD_SEPARATEINFOGILE) == "true")); + } + public function setPrecision($precision) { $this->setAttribute(REQUESTOUTPUTDOWNLOAD_PRECISION, $precision); -- libgit2 0.21.2