Merge pull request #579 from gschwind/pywps-4.4

Fix issue with stored request

Author: cehbrecht

pywps/app/Process.py

@@ -20,9 +20,11 @@
 from pywps.inout.outputs import output_from_json
 import pywps.configuration as config
 from pywps.exceptions import (StorageNotSupported, OperationNotSupported,
-                              ServerBusy, NoApplicableCode)
+                              ServerBusy, NoApplicableCode,
+                              InvalidParameterValue)
 from pywps.app.exceptions import ProcessError
 from pywps.inout.storage.builder import StorageBuilder
+from pywps.inout.outputs import ComplexOutput
 import importlib
 
 
@@ -311,6 +313,7 @@ def launch_next_process(self):
             process._set_uuid(uuid)
             process._setup_status_storage()
             process.async_ = True
+            process.setup_outputs_from_wps_request(new_wps_request)
             new_wps_response = ExecuteResponse(new_wps_request, process=process, uuid=uuid)
             new_wps_response.store_status_file = True
             process._run_async(new_wps_request, new_wps_response)
@@ -446,3 +449,31 @@ def _set_grass(self, wps_request):
             LOGGER.debug('GISRC {}, GISBASE {}, GISDBASE {}, LOCATION {}, MAPSET {}'.format(
                          os.environ.get('GISRC'), os.environ.get('GISBASE'),
                          dbase, location, os.path.basename(mapset_name)))
+
+    def setup_outputs_from_wps_request(self, wps_request):
+        # set as_reference to True for all the outputs specified as reference
+        # if the output is not required to be raw
+        if not wps_request.raw:
+            for wps_outpt in wps_request.outputs:
+
+                is_reference = wps_request.outputs[wps_outpt].get('asReference', 'false')
+                mimetype = wps_request.outputs[wps_outpt].get('mimetype', '')
+                if is_reference.lower() == 'true':
+                    # check if store is supported
+                    if self.store_supported == 'false':
+                        raise StorageNotSupported(
+                            'The storage of data is not supported for this process.')
+
+                    is_reference = True
+                else:
+                    is_reference = False
+
+                for outpt in self.outputs:
+                    if outpt.identifier == wps_outpt:
+                        outpt.as_reference = is_reference
+                        if isinstance(outpt, ComplexOutput) and mimetype != '':
+                            data_format = [f for f in outpt.supported_formats if f.mime_type == mimetype]
+                            if len(data_format) == 0:
+                                raise InvalidParameterValue(
+                                    'MimeType ' + mimetype + ' not valid')
+                            outpt.data_format = data_format[0]

pywps/app/Service.py

@@ -13,7 +13,6 @@
 from pywps.exceptions import MissingParameterValue, NoApplicableCode, InvalidParameterValue, FileSizeExceeded, \
     StorageNotSupported, FileURLNotSupported
 from pywps.inout.inputs import ComplexInput, LiteralInput, BoundingBoxInput
-from pywps.inout.outputs import ComplexOutput
 from pywps.dblog import log_request, store_status
 from pywps import response
 from pywps.response.status import WPS_STATUS
@@ -138,32 +137,7 @@ def _parse_and_execute(self, process, wps_request, uuid):
 
         wps_request.inputs = data_inputs
 
-        # set as_reference to True for all the outputs specified as reference
-        # if the output is not required to be raw
-        if not wps_request.raw:
-            for wps_outpt in wps_request.outputs:
-
-                is_reference = wps_request.outputs[wps_outpt].get('asReference', 'false')
-                mimetype = wps_request.outputs[wps_outpt].get('mimetype', '')
-                if is_reference.lower() == 'true':
-                    # check if store is supported
-                    if process.store_supported == 'false':
-                        raise StorageNotSupported(
-                            'The storage of data is not supported for this process.')
-
-                    is_reference = True
-                else:
-                    is_reference = False
-
-                for outpt in process.outputs:
-                    if outpt.identifier == wps_outpt:
-                        outpt.as_reference = is_reference
-                        if isinstance(outpt, ComplexOutput) and mimetype != '':
-                            data_format = [f for f in outpt.supported_formats if f.mime_type == mimetype]
-                            if len(data_format) == 0:
-                                raise InvalidParameterValue(
-                                    'MimeType ' + mimetype + ' not valid')
-                            outpt.data_format = data_format[0]
+        process.setup_outputs_from_wps_request(wps_request)
 
         wps_response = process.execute(wps_request, uuid)
         return wps_response