Changeset 4484

Timestamp:

24/11/08 10:04:23 (12 years ago)

Author:

cbyrom

Message:

Revert changes to myConfig code - this throws an exception when its get() method doesn't return a result - unlike other dicts.

File:

• exist/trunk/python/ndgUtils/ndgObject.py (modified) (2 diffs)

exist/trunk/python/ndgUtils/ndgObject.py

@@ -106 +106 @@
 
         # set default return format - if not set, just return in original format
-        fmt = self.config.get('DISCOVERY','formatDefault')
-        if fmt:
+        fmt=''
+        if self.config.has_option('DISCOVERY','formatDefault'):
+            fmt = self.config.get('DISCOVERY','formatDefault')
             logging.info("Default discovery format set to: %s" %fmt)
             
@@ -119 +120 @@
         # config file should have details on the service to use for the repository
         # - if not, default to 'unknown'
-        servicehost = self.config.get('NDG_B_SERVICE',self.repository)
-        if not servicehost:
-            servicehost = 'unknown'
+        servicehost = 'unknown'
+        if self.config.has_option('NDG_B_SERVICE',self.repository):
+                servicehost = self.config.get('NDG_B_SERVICE',self.repository)
             
         # If this record is itself a discovery record, then we don't have much more to do