Skip to content

StatusSucceeded is not anymore related to update_status with 100% #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 28, 2016
Merged

StatusSucceeded is not anymore related to update_status with 100% #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# PyWPS

[![Join the chat at https://gitter.im/geopython/pywps](https://badges.gitter.im/geopython/pywps.svg)](https://gitter.im/geopython/pywps?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

PyWPS is an implementation of the Web Processing Service standard from
the Open Geospatial Consortium. PyWPS is written in Python.

Expand Down Expand Up @@ -27,8 +29,8 @@ pip install -r requirements-dev.txt
# run unit tests
python -m unittest tests
# run code coverage
coverage run --source=pywps -m unittest tests
coverage report -m
python -m coverage run --source=pywps -m unittest tests
python -m coverage report -m
```

# Run web application
Expand Down
28 changes: 14 additions & 14 deletions pywps/app/WPSResponse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,13 @@ def _construct_doc(self):

# Status XML
# return the correct response depending on the progress of the process
if self.status >= STATUS.STORE_AND_UPDATE_STATUS:
if self.status == STATUS.STORE_AND_UPDATE_STATUS:
if self.status_percentage == 0:
self.message = 'PyWPS Process %s accepted' % self.process.identifier
status_doc = self._process_accepted()
doc.append(status_doc)
#self.write_response_doc(doc)
return doc
elif 0 < self.status_percentage < 100:
elif self.status_percentage > 0:
status_doc = self._process_started()
doc.append(status_doc)
return doc
Expand All @@ -175,20 +174,21 @@ def _construct_doc(self):

# TODO: add paused status

status_doc = self._process_succeeded()
doc.append(status_doc)
if self.status == STATUS.DONE_STATUS:
status_doc = self._process_succeeded()
doc.append(status_doc)

# DataInputs and DataOutputs definition XML if lineage=true
if self.wps_request.lineage == 'true':
data_inputs = [self.wps_request.inputs[i][0].execute_xml() for i in self.wps_request.inputs]
doc.append(WPS.DataInputs(*data_inputs))
# DataInputs and DataOutputs definition XML if lineage=true
if self.wps_request.lineage == 'true':
data_inputs = [self.wps_request.inputs[i][0].execute_xml() for i in self.wps_request.inputs]
doc.append(WPS.DataInputs(*data_inputs))

output_definitions = [self.outputs[o].execute_xml_lineage() for o in self.outputs]
doc.append(WPS.OutputDefinitions(*output_definitions))
output_definitions = [self.outputs[o].execute_xml_lineage() for o in self.outputs]
doc.append(WPS.OutputDefinitions(*output_definitions))

# Process outputs XML
output_elements = [self.outputs[o].execute_xml() for o in self.outputs]
doc.append(WPS.ProcessOutputs(*output_elements))
# Process outputs XML
output_elements = [self.outputs[o].execute_xml() for o in self.outputs]
doc.append(WPS.ProcessOutputs(*output_elements))
return doc

def call_on_close(self, function):
Expand Down