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

[scm-commit@wald.intevation.org]

Author: jachym
Date: 2008-07-18 17:04:50 +0200 (Fri, 18 Jul 2008)
New Revision: 517

Modified:
   trunk/pywps/Parser/DescribeProcess.py
   trunk/pywps/Parser/GetCapabilities.py
Log:
updated documentation for capabilities and describe documents

Modified: trunk/pywps/Parser/DescribeProcess.py
===================================================================
--- trunk/pywps/Parser/DescribeProcess.py	2008-07-18 14:55:48 UTC (rev 516)
+++ trunk/pywps/Parser/DescribeProcess.py	2008-07-18 15:04:50 UTC (rev 517)
@@ -56,7 +56,6 @@
 
         #
         # Mandatory options
-        #
         
         # service
         self.wps.inputs["service"] = "wps"
@@ -77,12 +76,11 @@
 
         #
         # Optional options
-        #
             
         # language
         language = firstChild.getAttribute("language")
         if not language:
-            language = self.wps.DEFAULT_LANGUAGE
+            language = self.wps.defaultLanguage
 
         self.wps.inputs["language"] = language
 
@@ -106,11 +104,12 @@
         self.wps = wps
 
     def parse(self,unparsedInputs):
+        """ Parse given raw inputs"""
+
         self.unparsedInputs = unparsedInputs
 
         #
         # Mandatory options
-        #
 
         # service (is allready controled)
         if self.unparsedInputs["service"].lower() == "wps":
@@ -128,12 +127,11 @@
 
         # 
         # Optional options
-        #
 
         # Language
         try:
             self.wps.inputs["language"] =\
                                     self.unparsedInputs["language"].lower()
         except KeyError,e:
-            self.wps.inputs["language"] = self.wps.DEFAULT_LANGUAGE
+            self.wps.inputs["language"] = self.wps.defaultLanguage
 

Modified: trunk/pywps/Parser/GetCapabilities.py
===================================================================
--- trunk/pywps/Parser/GetCapabilities.py	2008-07-18 14:55:48 UTC (rev 516)
+++ trunk/pywps/Parser/GetCapabilities.py	2008-07-18 15:04:50 UTC (rev 517)
@@ -29,8 +29,7 @@
 from pywps.Parser.Post import Post
 
 class Post(Post):
-    """
-    Parses input request obtained via HTTP POST encoding - should be XML
+    """ Parses input request obtained via HTTP POST encoding - should be XML
     file.
     """
     wps = None # main WPS instance
@@ -46,6 +45,7 @@
         self.wps = wps
 
     def parse(self,document):
+        """ Parse the requesed XML document"""
         self.document = document  # input DOM
 
         versions = []   # accepted versions
@@ -57,7 +57,6 @@
 
         #
         # Mandatory options
-        #
         
         # service
         self.wps.inputs["service"] = "wps"
@@ -67,7 +66,6 @@
 
         #
         # Optional options
-        #
             
         # acceptVersions
         acceptedVersionsNodes = self.document.getElementsByTagNameNS(
@@ -85,16 +83,14 @@
         # language
         language = self.controll(firstChild.getAttribute("language"))
         if not language:
-            language = self.wps.DEFAULT_LANGUAGE
+            language = self.wps.defaultLanguage
 
         self.wps.inputs["language"] = language
 
         return
 
 class Get:
-    """
-    Parses input request obtained via HTTP GET encoding.
-    """
+    """ Parses input request obtained via HTTP GET encoding.  """
 
     wps = None  # main WPS instance
     unparsedInputs = {} # input arguments
@@ -109,11 +105,12 @@
         self.wps = wps
 
     def parse(self,unparsedInputs):
+        """ Parse rawly parsed inputs """
+        
         self.unparsedInputs = unparsedInputs
 
         #
         # Mandatory options
-        #
 
         # service (is already controlled)
         if self.unparsedInputs["service"].lower() == "wps":
@@ -125,7 +122,6 @@
 
         # 
         # Optional options
-        #
 
         # AcceptVersions
         try:
@@ -143,5 +139,5 @@
             self.wps.inputs["language"] =\
                                     self.unparsedInputs["language"].lower()
         except KeyError,e:
-            self.wps.inputs["language"] = self.wps.DEFAULT_LANGUAGE
+            self.wps.inputs["language"] = self.wps.defaultLanguage