[Pywps-commits] r543 - in trunk/pywps: Parser Process WPS

[scm-commit@wald.intevation.org]

Author: jachym
Date: 2008-07-25 08:34:24 +0200 (Fri, 25 Jul 2008)
New Revision: 543

Modified:
   trunk/pywps/Parser/Execute.py
   trunk/pywps/Process/InAndOutputs.py
   trunk/pywps/WPS/Execute.py
Log:
removed old ComplexValueReference data type

Modified: trunk/pywps/Parser/Execute.py
===================================================================
--- trunk/pywps/Parser/Execute.py	2008-07-23 08:20:14 UTC (rev 542)
+++ trunk/pywps/Parser/Execute.py	2008-07-25 06:34:24 UTC (rev 543)
@@ -296,9 +296,9 @@
         except IndexError:
             attributes["bodyreference"] = None
 
+        attributes["type"] = "ComplexValue"
+        attributes["asReference"] = True
         
-        attributes["type"] = "ComplexValueReference"
-        
         return attributes
 
     def parseHeaderDataInput(self,headerNode):

Modified: trunk/pywps/Process/InAndOutputs.py
===================================================================
--- trunk/pywps/Process/InAndOutputs.py	2008-07-23 08:20:14 UTC (rev 542)
+++ trunk/pywps/Process/InAndOutputs.py	2008-07-25 06:34:24 UTC (rev 543)
@@ -146,10 +146,10 @@
         # if HTTP GET was performed, the type does not have to be set
         if not input.has_key("type") and\
                 input["value"].find("http://") == 0:
-            input["type"] = "ComplexValueReference"
+            input["asReference"] = True
 
         # download data
-        if input["type"] == "ComplexValueReference":
+        if input["asReference"] == True:
             self.downloadData(input["value"])
         else:
             self.storeData(input["value"])

Modified: trunk/pywps/WPS/Execute.py
===================================================================
--- trunk/pywps/WPS/Execute.py	2008-07-23 08:20:14 UTC (rev 542)
+++ trunk/pywps/WPS/Execute.py	2008-07-25 06:34:24 UTC (rev 543)
@@ -381,7 +381,8 @@
 
             if input.type == "LiteralValue":
                 templateInput = self._lineageLiteralInput(input,templateInput)
-            elif wpsInput["type"] == "ComplexValueReference":
+            elif wpsInput["type"] == "ComplexValue" and \
+                                            wpsInput["asReference"] == True:
                 templateInput = self._lineageComplexReferenceInput(wpsInput,
                                                             input,templateInput)
             elif input.type == "ComplexValue":