[Pywps-commits] r490 - in trunk/pywps: Templates WPS

[scm-commit@wald.intevation.org]

Author: sebastianh
Date: 2008-05-28 09:59:38 +0200 (Wed, 28 May 2008)
New Revision: 490

Modified:
   trunk/pywps/Templates/GetCapabilities.tmpl
   trunk/pywps/WPS/GetCapabilities.py
Log:
GetCapabilities-document improvements II

Modified: trunk/pywps/Templates/GetCapabilities.tmpl
===================================================================
--- trunk/pywps/Templates/GetCapabilities.tmpl	2008-05-28 05:57:01 UTC (rev 489)
+++ trunk/pywps/Templates/GetCapabilities.tmpl	2008-05-28 07:59:38 UTC (rev 490)
@@ -48,22 +48,22 @@
                                 </TMPL_IF>
                                 <TMPL_IF address>
 				<ows:Address>
-                                        <TMPL_IF deliveryPoint>
+                                        <TMPL_IF deliverypoint>
 					<ows:DeliveryPoint><TMPL_VAR deliverypoint></ows:DeliveryPoint>
                                         </TMPL_IF>
                                         <TMPL_IF city>
 					<ows:City><TMPL_VAR city></ows:City>
                                         </TMPL_IF>
-                                        <TMPL_IF administrativeArea>
+                                        <TMPL_IF administrativearea>
 					<ows:AdministrativeArea><TMPL_VAR administrativearea></ows:AdministrativeArea>
                                         </TMPL_IF>
-                                        <TMPL_IF postalCode>
+                                        <TMPL_IF postalcode>
 					<ows:PostalCode><TMPL_VAR postalcode></ows:PostalCode>
                                         </TMPL_IF>
                                         <TMPL_IF country>
 					<ows:Country><TMPL_VAR country></ows:Country>
                                         </TMPL_IF>
-                                        <TMPL_IF electronicMailAddress>
+                                        <TMPL_IF electronicmailaddress>
 					<ows:ElectronicMailAddress><TMPL_VAR electronicmailaddress></ows:ElectronicMailAddress>
                                         </TMPL_IF>
 				</ows:Address>

Modified: trunk/pywps/WPS/GetCapabilities.py
===================================================================
--- trunk/pywps/WPS/GetCapabilities.py	2008-05-28 05:57:01 UTC (rev 489)
+++ trunk/pywps/WPS/GetCapabilities.py	2008-05-28 07:59:38 UTC (rev 490)
@@ -121,11 +121,13 @@
            self.templateProcessor.set("address", 0)
             
         # OperationsMetadata
-        self.templateProcessor.set("url",self.wps.getConfigValue("wps","serveraddress"))
         self.templateProcessor.set("Operations",
-                                    [{"operation":"GetCapabilities"}, 
-                                     {"operation":"DescribeProcess"},
-                                     {"operation":"Execute"}])
+             [{"operation":"GetCapabilities",
+               "url":self.wps.getConfigValue("wps","serveraddress")}, 
+              {"operation":"DescribeProcess",
+               "url":self.wps.getConfigValue("wps","serveraddress")},
+              {"operation":"Execute",
+               "url":self.wps.getConfigValue("wps","serveraddress")}])
 
         # Processes
         processesData = []