[Pywps-commits] r486 - trunk/pywps/Parser

[scm-commit@wald.intevation.org]

Author: jachym
Date: 2008-05-17 16:04:45 +0200 (Sat, 17 May 2008)
New Revision: 486

Modified:
   trunk/pywps/Parser/Get.py
   trunk/pywps/Parser/GetCapabilities.py
   trunk/pywps/Parser/Post.py
   trunk/pywps/Parser/__init__.py
Log:
Controlling inputs. Todo: Post method

Modified: trunk/pywps/Parser/Get.py
===================================================================
--- trunk/pywps/Parser/Get.py	2008-05-17 14:03:57 UTC (rev 485)
+++ trunk/pywps/Parser/Get.py	2008-05-17 14:04:45 UTC (rev 486)
@@ -20,8 +20,9 @@
 
 import types,sys
 from string import split
+from pywps.Parser.Parser import Parser
 
-class Get:
+class Get(Parser):
     wps = None
     fieldStorage = None
     unparsedInputs =  {}
@@ -33,6 +34,7 @@
     requestParser = None
 
     def __init__(self,wps):
+        Parser.__init__(self,wps)
         self.wps = wps
 
     def parse(self,queryString):
@@ -65,6 +67,7 @@
 
         for key in self.unparsedInputs.keys():
             value = self.unparsedInputs[key]
+            value = self.controll(value)
 
             # check size
             if self.wps.maxInputLength > 0 and\

Modified: trunk/pywps/Parser/GetCapabilities.py
===================================================================
--- trunk/pywps/Parser/GetCapabilities.py	2008-05-17 14:03:57 UTC (rev 485)
+++ trunk/pywps/Parser/GetCapabilities.py	2008-05-17 14:04:45 UTC (rev 486)
@@ -74,7 +74,7 @@
         if len(acceptedVersionsNodes) > 0:
             for versionNode in\
                 acceptedVersionsNodes[-1].getElementsByTagNameNS(nameSpace,"Version"):
-                versions.append(versionNode.firstChild.nodeValue)
+                versions.append(self.controll(versionNode.firstChild.nodeValue))
 
         if len(versions) == 0:
             versions = [self.wps.DEFAULT_WPS_VERSION]
@@ -82,7 +82,7 @@
         self.wps.inputs["acceptversions"] = versions
 
         # language
-        language = firstChild.getAttribute("language")
+        language = self.controll(firstChild.getAttribute("language"))
         if not language:
             language = self.wps.DEFAULT_LANGUAGE
 

Modified: trunk/pywps/Parser/Post.py
===================================================================
--- trunk/pywps/Parser/Post.py	2008-05-17 14:03:57 UTC (rev 485)
+++ trunk/pywps/Parser/Post.py	2008-05-17 14:04:45 UTC (rev 486)
@@ -21,8 +21,9 @@
 import types,sys
 import xml
 from xml.dom.minidom import parseString
+from pywps.Parser.Parser import Parser
 
-class Post:
+class Post(Parser):
 
     document = None # Document Object Model
 
@@ -31,6 +32,7 @@
     EXECUTE = "Execute"
 
     def __init__(self,wps):
+        Parser.__init__(self,wps)
         self.wps = wps
 
     def parse(self,file):
@@ -63,14 +65,15 @@
     def findRequestType(self):
 
         firstChild = self.getFirstChildNode(self.document)
+        firstTagName = self.controll(firstChild.tagName)
 
-        if firstChild.tagName.find(self.GET_CAPABILITIES) > -1:
+        if firstTagName.find(self.GET_CAPABILITIES) > -1:
             import GetCapabilities 
             self.requestParser = GetCapabilities.Post(self.wps)
-        elif firstChild.tagName.find(self.DESCRIBE_PROCESS) > -1:
+        elif firstTagName.find(self.DESCRIBE_PROCESS) > -1:
             import DescribeProcess 
             self.requestParser = DescribeProcess.Post(self.wps)
-        elif firstChild.tagName.find(self.EXECUTE) > -1:
+        elif firstTagName.find(self.EXECUTE) > -1:
             import Execute 
             self.requestParser = Execute.Post(self.wps)
         else:

Modified: trunk/pywps/Parser/__init__.py
===================================================================
--- trunk/pywps/Parser/__init__.py	2008-05-17 14:03:57 UTC (rev 485)
+++ trunk/pywps/Parser/__init__.py	2008-05-17 14:04:45 UTC (rev 486)
@@ -5,6 +5,7 @@
 Each class in the package is resposible for each type of the request.
 """
 __all__ = [
+        "Parser",
         "Get",
         "Post",
         "GetCapabilities",