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

[scm-commit@wald.intevation.org]

Author: sebastianh
Date: 2008-04-15 13:07:19 +0200 (Tue, 15 Apr 2008)
New Revision: 472

Modified:
   trunk/pywps/Parser/Get.py
   trunk/pywps/WPS/Request.py
Log:
better handling of missing service parameter

Modified: trunk/pywps/Parser/Get.py
===================================================================
--- trunk/pywps/Parser/Get.py	2008-04-14 15:13:05 UTC (rev 471)
+++ trunk/pywps/Parser/Get.py	2008-04-15 11:07:19 UTC (rev 472)
@@ -55,8 +55,7 @@
             self.parseInputs()
             self.findRequestType()
         except KeyError,e:  # if service or request keys not found
-            raise self.wps.exceptions.MissingParameterValue(e.message)
-                                             # FIXME: e.message is not existing
+            raise self.wps.exceptions.MissingParameterValue(str(e).strip("'"))
             
 
     def parseInputs(self):
@@ -73,7 +72,7 @@
                
                 raise FileSizeExceeded(key)
 
-        # check service name; service name is mandatory!
+        # check service name: service name is mandatory; service must be "WPS"
         if self.unparsedInputs[self.SERVICE].lower() != self.WPS:
             raise self.wps.exceptions.InvalidParameterValue(
                     self.unparsedInputs[self.SERVICE])

Modified: trunk/pywps/WPS/Request.py
===================================================================
--- trunk/pywps/WPS/Request.py	2008-04-14 15:13:05 UTC (rev 471)
+++ trunk/pywps/WPS/Request.py	2008-04-15 11:07:19 UTC (rev 472)
@@ -24,6 +24,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 import xml.dom.minidom
+# make sure, that the package python-htmltmpl is installed on your system!
 from htmltmpl import TemplateManager, TemplateProcessor
 import os
 from pywps import Templates