Changeset 5746

Timestamp:

22/09/09 12:48:50 (11 years ago)

Author:

sdonegan

Message:

Adjusted so as to provide discovery service API url to the methods called in ndgRetrieve.py and discoveryServiceClient.py - optional, replacing hardcoded uri

File:

• ndgCommon/trunk/ndg/common/src/models/ndgObject.py (modified) (4 diffs)

ndgCommon/trunk/ndg/common/src/models/ndgObject.py

@@ -81 +81 @@
         ok=1
         if len(bits)==3:
+            
             repository,schema,localID=bits
             self.uri=uri.replace(':','__')
         elif len(bits2)==3:
+            
             repository,schema,localID=bits2
             self.uri=uri
         elif len(bits2)>3:
+            
             repository,schema,localID=bits2[0],bits2[1],'__'.join(bits2[2:])
             self.uri=uri
@@ -114 +117 @@
         Set up the configuration for retrieving this document 
         '''
+        
+        
         logging.debug("Setting up configuration for retrieving document")
+        
+        
+        
         self.config=config
-        if not config:
+        if not config:            
             return
+        
+        self.discoveryServiceURL = self.config.get('DISCOVERY','discoveryServiceURL')        
+        
         
         self.server=self.config.get('DISCOVERY','default')
@@ -127 +138 @@
         self.viewService='%s/view/'%server
         discoveryBASE='%s%s__%s__%s'%(self.viewService,self.repository,self.schema,self.localID)
-
+        
         # set default return format - if not set, just return in original format
         fmt = self.config.get('DISCOVERY','formatDefault')
         logging.info("Default discovery format set to: %s" %fmt)
-            
+        
         # We'll build the following even if it can't be used (as would be the case for
         # a non data entity B record or an A record) because it's a useful template.
@@ -138 +149 @@
 
         self.discoveryURL=self.__buildURL(discoveryBASE,[qs])
-
+        
         # config file should have details on the service to use for the repository
         # - if not, default to 'unknown'