joey: thuban/Extensions/wms capabilities.py,1.4,1.5

cvs@intevation.de cvs at intevation.de
Thu Apr 1 12:06:15 CEST 2004


Author: joey

Update of /thubanrepository/thuban/Extensions/wms
In directory doto:/tmp/cvs-serv18768

Modified Files:
	capabilities.py 
Log Message:
Revert part of former changes, since the capabilities XML is used by
more methods.

Index: capabilities.py
===================================================================
RCS file: /thubanrepository/thuban/Extensions/wms/capabilities.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- capabilities.py	1 Apr 2004 09:58:30 -0000	1.4
+++ capabilities.py	1 Apr 2004 10:06:13 -0000	1.5
@@ -114,12 +114,11 @@
     def fetchCapabilities(self, resource):
         """Fetches the WMS capabilities from an Internet resource"""
 
-        xml = None
         self.wmsVersion = "1.1"
-        xml = self.getCapabilities(resource, self.wmsVersion)
+        self.capabilities = self.getCapabilities(resource, self.wmsVersion)
         if not self.capabilities:
             self.wmsVersion = "1.0"
-            xml = self.getCapabilities(resource, self.wmsVersion)
+            self.capabilities = self.getCapabilities(resource, self.wmsVersion)
 
 
     def saveCapabilities(self, fname):
@@ -141,7 +140,7 @@
 
         try:
             input = open(fname, "r")
-            xml = input.read()
+            self.capabilities = input.read()
             input.close()
         except IOError:
             self.errorMsg = _("Can't open file '%s' for reading") % fname





More information about the Thuban-devel mailing list

This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)