[Pywps-commits] r958 - in trunk: pywps/Parser pywps/Process pywps/Templates/1_0_0 pywps/Wps tests/processes
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Jun 29 16:13:22 CEST 2010
Author: jachym
Date: 2010-06-29 16:13:19 +0200 (Tue, 29 Jun 2010)
New Revision: 958
Modified:
trunk/pywps/Parser/DescribeProcess.py
trunk/pywps/Parser/GetCapabilities.py
trunk/pywps/Process/InAndOutputs.py
trunk/pywps/Process/__init__.py
trunk/pywps/Templates/1_0_0/DescribeProcess.tmpl
trunk/pywps/Templates/1_0_0/Execute.tmpl
trunk/pywps/Templates/1_0_0/GetCapabilities.tmpl
trunk/pywps/Wps/DescribeProcess.py
trunk/pywps/Wps/Execute.py
trunk/pywps/Wps/GetCapabilities.py
trunk/pywps/Wps/Wsdl.py
trunk/tests/processes/tests.py
Log:
fixed wsdl response
Modified: trunk/pywps/Parser/DescribeProcess.py
===================================================================
--- trunk/pywps/Parser/DescribeProcess.py 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Parser/DescribeProcess.py 2010-06-29 14:13:19 UTC (rev 958)
@@ -43,10 +43,8 @@
self.document = document # input DOM
- firstChild = self.getFirstChildNode(self.document)
+ firstChild = self.isSoapFirstChild(self.document) # no comments or
- if self.isSoap:
- firstChild = self.getFirstChildNode(self.document) # no comments or
owsNameSpace = pywps.OWS_NAMESPACE
identifiers = []
identifierNode = None
Modified: trunk/pywps/Parser/GetCapabilities.py
===================================================================
--- trunk/pywps/Parser/GetCapabilities.py 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Parser/GetCapabilities.py 2010-06-29 14:13:19 UTC (rev 958)
@@ -49,10 +49,7 @@
acceptedVersionsNodes = None
versionNode = None
- firstChild = self.getFirstChildNode(self.document)
-
- if self.isSoap:
- firstChild = self.getFirstChildNode(self.document) # no comments or
+ firstChild = self.isSoapFirstChild(self.document) # no comments or
owsNameSpace = pywps.OWS_NAMESPACE
wpsNameSpace = pywps.WPS_NAMESPACE
Modified: trunk/pywps/Process/InAndOutputs.py
===================================================================
--- trunk/pywps/Process/InAndOutputs.py 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Process/InAndOutputs.py 2010-06-29 14:13:19 UTC (rev 958)
@@ -34,7 +34,7 @@
:param identifier: input identifier
:param title: input title
:param abstract: input description.
- :param metadata: List of {key:value} pairs.
+ :param metadata: List of metadata references.
:param minOccurs: minimum number of occurrences.
:param maxOccurs: maximum number of occurrences.
:param type: one of "LiteralValue", "ComplexValue" or "BoundingBoxValue"
@@ -53,7 +53,7 @@
.. attribute :: metadata
- input metadata
+ input metadata reference
.. attribute :: minOccurs
@@ -298,7 +298,7 @@
:param identifier: input identifier
:param title: input title
:param abstract: input description.
- :param metadata: List of {key:value} pairs.
+ :param metadata: List of metadata references.
:param minOccurs: minimum number of occurencies.
:param maxOccurs: maximum number of occurencies.
:param formats: List of objects according to table 23 (page 25). E.g.
@@ -554,7 +554,7 @@
:param identifier: input identifier
:param title: input title
:param abstract: input description.
- :param metadata: List of {key:value} pairs.
+ :param metadata: List of metadata references.
:param minOccurs: minimum number of occurrences.
:param maxOccurs: maximum number of occurrences.
:param crss: List of strings supported coordinate systems.
@@ -690,7 +690,7 @@
:param identifier: input identifier
:param title: input title
:param abstract: input description.
- :param metadata: List of {key:value} pairs.
+ :param metadata: List of metadata references.
:param type: one of "LiteralValue", "ComplexValue" or "BoundingBoxValue"
:param asReference: whether this output will be given back as
reference or as file
@@ -753,7 +753,7 @@
:param identifier: input identifier
:param title: input title
:param abstract: input description. Default: None
- :param metadata: List of {key:value}s additional metadata
+ :param metadata: List of meatadata references
:param uoms: List of string values units
:param dataType: :class:`types.TypeType` value type, e.g. Integer, String, etc. you
can uses the "types" module of python.
@@ -783,7 +783,7 @@
:param identifier: output identifier
:param title: output title
- :param metadata: List of {key:value} pairs.
+ :param metadata: List of metadata references
:param formats: List of format structure according to table 23 (page
25). E.g.::
Modified: trunk/pywps/Process/__init__.py
===================================================================
--- trunk/pywps/Process/__init__.py 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Process/__init__.py 2010-06-29 14:13:19 UTC (rev 958)
@@ -115,11 +115,11 @@
:type title: string
:param abstract: process description
:type abstract: string
- :param metadata: List of additional metadata. See http://www.opengeospatial.org/standards/common, table 32 on page 65
+ :param metadata: List of additional metadata references. See http://www.opengeospatial.org/standards/common, table 32 on page 65
Example::
- ["foo":"bar"]
+ ["http://bnhelp.cz/metadata/micka_main.php?ak=detail&uuid=32e80880-c3b0-11dc-8641-873e117140a9"]
:param profile: profile URN
:type profile: [string]
@@ -145,7 +145,7 @@
.. attribute:: metadata
- Metadata object
+ List of references to metadata resources
.. attribute:: title
@@ -343,12 +343,12 @@
default: types.IntType
:type type: `types.TypeType`
:param default: default value of this input
- :param metadata: List of additional metadata
+ :param metadata: List of additional metadata references. See http://www.opengeospatial.org/standards/common, table 32 on page 65
+
+ Example::
+
+ {"Title of metadata link":"http://bnhelp.cz/metadata/micka_main.php?ak=detail&uuid=32e80880-c3b0-11dc-8641-873e117140a9"}
- Example::
-
- {"foo":"bar"}
-
default: None
:returns: :class:`pywps.Process.InAndOutputs.LiteralInput`
@@ -389,12 +389,14 @@
:param maxmegabites: Maximum input file size. Can not be bigger, as
defined in global configuration file.
- :param metadata: List of additional metadata
+ :param metadata: List of additional metadata references. See http://www.opengeospatial.org/standards/common, table 32 on page 65
+
+ Example::
+
+ ["http://bnhelp.cz/metadata/micka_main.php?ak=detail&uuid=32e80880-c3b0-11dc-8641-873e117140a9"]
- Example::
+ default: None
- {"foo":"bar"}
-
:returns: :class:`pywps.Process.InAndOutputs.ComplexInput`
"""
@@ -417,8 +419,8 @@
:type title: string
:param abstract: input description.
:type abstract: string
- :param metadata: List of {key:value} pairs.
- :type metadata: object
+ :param metadata: List of metadata references.
+ :type metadata: list
:param minOccurs: minimum number of occurrences.
:type maxOccurs: integer
:param maxOccurs: maximum number of occurrences.
@@ -442,7 +444,14 @@
:param identifier: output identifier
:param title: output title
- :param metadata: List of {key:value} pairs.
+ :param metadata: List of additional metadata references. See http://www.opengeospatial.org/standards/common, table 32 on page 65
+
+ Example::
+
+ ["http://bnhelp.cz/metadata/micka_main.php?ak=detail&uuid=32e80880-c3b0-11dc-8641-873e117140a9"]
+
+ default: None
+
:param formats: List of dictionaries according to table 23 (page
25) of the standard
Modified: trunk/pywps/Templates/1_0_0/DescribeProcess.tmpl
===================================================================
--- trunk/pywps/Templates/1_0_0/DescribeProcess.tmpl 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Templates/1_0_0/DescribeProcess.tmpl 2010-06-29 14:13:19 UTC (rev 958)
@@ -9,7 +9,7 @@
<ows:Abstract><TMPL_VAR abstract></ows:Abstract>
</TMPL_IF>
<TMPL_LOOP Metadata>
- <ows:Metadata xlink:title="<TMPL_VAR metadatatitle>" />
+ <ows:Metadata xlink:title="<TMPL_VAR metadata>" />
</TMPL_LOOP>
<TMPL_LOOP Profiles>
<wps:Profile><TMPL_VAR profile></wps:Profile>
Modified: trunk/pywps/Templates/1_0_0/Execute.tmpl
===================================================================
--- trunk/pywps/Templates/1_0_0/Execute.tmpl 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Templates/1_0_0/Execute.tmpl 2010-06-29 14:13:19 UTC (rev 958)
@@ -7,7 +7,7 @@
<ows:Abstract><TMPL_VAR abstract></ows:Abstract>
</TMPL_IF>
<TMPL_LOOP Metadata>
- <ows:Metadata xlink:title="<TMPL_VAR metadatatitle>" />
+ <ows:Metadata xlink:title="<TMPL_VAR metadata>" />
</TMPL_LOOP>
<TMPL_LOOP Profiles>
<wps:Profile><TMPL_VAR profile></wps:Profile>
Modified: trunk/pywps/Templates/1_0_0/GetCapabilities.tmpl
===================================================================
--- trunk/pywps/Templates/1_0_0/GetCapabilities.tmpl 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Templates/1_0_0/GetCapabilities.tmpl 2010-06-29 14:13:19 UTC (rev 958)
@@ -109,7 +109,7 @@
<ows:Abstract><TMPL_VAR abstract></ows:Abstract>
</TMPL_IF>
<TMPL_LOOP Metadata>
- <ows:Metadata xlink:title="<TMPL_VAR metadatatitle>" />
+ <ows:Metadata xlink:href="<TMPL_VAR metadata>" />
</TMPL_LOOP>
<TMPL_LOOP Profiles>
<wps:Profile><TMPL_VAR profile></wps:Profile>
Modified: trunk/pywps/Wps/DescribeProcess.py
===================================================================
--- trunk/pywps/Wps/DescribeProcess.py 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Wps/DescribeProcess.py 2010-06-29 14:13:19 UTC (rev 958)
@@ -79,7 +79,7 @@
if process.metadata:
metadata=[]
for meta in process.metadata:
- metadata.append({"metadatatitle":meta})
+ metadata.append({"metadata":meta})
processData["Metadata"] = metadata
if process.profile:
profiles=[]
Modified: trunk/pywps/Wps/Execute.py
===================================================================
--- trunk/pywps/Wps/Execute.py 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Wps/Execute.py 2010-06-29 14:13:19 UTC (rev 958)
@@ -590,7 +590,7 @@
if self.process.metadata:
metadata=[]
for meta in self.process.metadata:
- metadata.append({"metadatatitle":meta})
+ metadata.append({"metadata":meta})
self.templateProcessor.set("Metadata", metadata)
if self.process.profile:
profiles=[]
Modified: trunk/pywps/Wps/GetCapabilities.py
===================================================================
--- trunk/pywps/Wps/GetCapabilities.py 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Wps/GetCapabilities.py 2010-06-29 14:13:19 UTC (rev 958)
@@ -157,7 +157,7 @@
if process.metadata:
metadata=[]
for meta in process.metadata:
- metadata.append({"metadatatitle":meta})
+ metadata.append({"metadata":meta})
processData["Metadata"] = metadata
if process.profile:
profiles=[]
Modified: trunk/pywps/Wps/Wsdl.py
===================================================================
--- trunk/pywps/Wps/Wsdl.py 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/pywps/Wps/Wsdl.py 2010-06-29 14:13:19 UTC (rev 958)
@@ -23,13 +23,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-from Response import Response
-from htmltmpl import TemplateError
+from pywps.Wps import Request
+from pywps.Template import TemplateError
import os,types
import pywps
from pywps import config
-class Wsdl(Response):
+class Wsdl(Request):
"""
"""
@@ -39,14 +39,8 @@
self
wps - parent WPS instance
"""
- Response.__init__(self,wps)
+ Request.__init__(self,wps)
- try:
- self.template = self.templateManager.prepare(self.templateFile)
- except TemplateError,e:
- self.cleanEnv()
- raise self.wps.exceptions.NoApplicableCode(e.__str__())
-
#
# global variables
#
@@ -59,7 +53,7 @@
#
#self.templateProcessor.set("Processes",self.processesDescription())
- self.response = self.templateProcessor.process(self.template)
+ self.response = self.templateProcessor.__str__()
return
Modified: trunk/tests/processes/tests.py
===================================================================
--- trunk/tests/processes/tests.py 2010-06-24 17:55:31 UTC (rev 957)
+++ trunk/tests/processes/tests.py 2010-06-29 14:13:19 UTC (rev 958)
@@ -12,7 +12,7 @@
def __init__(self):
WPSProcess.__init__(self, identifier = "literalprocess",
- title="Literal process")
+ title="Literal process",metadata=["http://foo/bar","http://bar/foo"])
self.intIn = self.addLiteralInput(identifier="int",
title="Integer data in")
More information about the Pywps-commits
mailing list