Jachym Cepicky преди 13 години
родител
ревизия
1a1d2964c9
променени са 1 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 6 6
      OWS.py

+ 6 - 6
OWS.py

@@ -85,29 +85,29 @@ class OWS:
             from owslib.wfs import WebFeatureService
             # FIXME Make default version configurable
             try:
-                raise "2.0.0 not supported" 
+                # raise "2.0.0 not supported" 
                 # FIXME continue to 1.1.0 
                 self.capabilities = self.__getCapabilitiesFromFile(WebFeatureService,"2.0.0")
                 if self.capabilities == None and self.url:
-                    logging.debug("OWS.py:: Downloading new capabilities file")
+                    logging.debug("OWS.py:: Downloading new capabilities file for WFS 2.0.0")
                     self.capabilities = WebFeatureService(url=self.url,version="2.0.0")
-            except:
+            except Exception,e:
                 try:
                     self.capabilities = self.__getCapabilitiesFromFile(WebFeatureService,"1.1.0")
                     if self.capabilities == None and self.url:
-                        logging.debug("OWS.py:: Downloading new capabilities file")
+                        logging.debug("OWS.py:: Downloading new capabilities file for WFS 1.1.0")
                         self.capabilities = WebFeatureService(url=self.url,version="1.1.0")
                 except:
                     self.capabilities = self.__getCapabilitiesFromFile(WebFeatureService,"1.0.0")
                     if self.capabilities == None and self.url:
-                        logging.debug("OWS.py:: Downloading new capabilities file")
+                        logging.debug("OWS.py:: Downloading new capabilities file for WFS 1.0.0")
                         self.capabilities = WebFeatureService(url=self.url,version="1.0.0")
 
         elif self.service == "WCS":
             from owslib.wcs import WebCoverageService
             self.capabilities = self.__getCapabilitiesFromFile(WebCoverageService,"1.0.0")
             if self.capabilities == None and self.url:
-                logging.debug("OWS.py:: Downloading new capabilities file")
+                logging.debug("OWS.py:: Downloading new capabilities file for WCS 1.0.0")
                 self.capabilities = WebCoverageService(url=self.url,version="1.0.0")
 
     def getParams(self):