Changeset 2422

Timestamp:

20/04/07 08:12:11 (12 years ago)

Author:

lawrence

Message:

Code to support late binding to Browse service

Location:

TI07-MOLES/trunk/PythonCode/wsgi

Files:

• DIF.py (modified) (5 diffs)
• DiscoveryGUI.py (modified) (1 diff)
• ndgDiscovery.config (modified) (1 diff)
• ndgObject.py (modified) (5 diffs)
• ndgRetrieve.py (modified) (2 diffs)
• renderService.py (modified) (1 diff)
• stubB.py (modified) (1 diff)

TI07-MOLES/trunk/PythonCode/wsgi/DIF.py

@@ -9 +9 @@
 from renderEntity import renderEntity
 from ServiceBinding import DIFService
+from ndgObject import ndgObject
 try: #python 2.5
     from xml.etree import ElementTree as ET
@@ -36 +37 @@
     note ... not a complete implementation, currently minimum to
     show a reasonable piece of content '''
-    def __init__(self,xml,et=0,debug=0,ndgObject=None):
+    def __init__(self,xml,et=0,debug=0,ndgObj=None):
         
         '''Initialise a python dif instance based on an xml document (expected
@@ -61 +62 @@
         
         # if this is an ndgObject that'll have been sorted externally ...
-        self.ndgObject=ndgObject
+        self.ndgObject=ndgObj
         
         # now try and interpret it 
@@ -158 +159 @@
                  helper.getText(item,'URL'),
                  helper.getText(item,'Description') ))
-        
+        
         if self.ndgObject is None:
             self.binding=None
@@ -164 +165 @@
             if self.ndgObject.discoveryURL is not None:
                 self.binding=DIFService('DISCOVERY',self.ndgObject.discoveryURL,'Discovery record')
+                #explicitly do late binding on NDG-B URL 
+                #... and override contents in metadatarecord
+                print '1'
+                B='%s__%s__%s'%(self.ndgObject.repository,'NDG-B1',self.ndgObject.localID)
+                Bobject=ndgObject(B,config=self.ndgObject.config)
+                print '2'
+                bdone=0
+                if Bobject.gettable!=-1:
+                    for s in self.services:
+                        print '3 ',s.contentType
+                        if s.contentType=='NDG_B_SERVICE': 
+                            s.url=Bobject.URL
+                            bdone=1
+                    print '4'
+                    if not bdone: self.services.append(
+                                DIFService('NDG_B_SERVICE',Bobject.URL,'NDG Browse Metadata Service'))
             else: self.binding=None
-
+            print '5'
         if self.debug:
            f=open('difs.log','a')

TI07-MOLES/trunk/PythonCode/wsgi/DiscoveryGUI.py

@@ -139 +139 @@
                     obj.setConfig(self.config)
                     try:
-                        difs.append(DIF(result[1],ndgObject=obj))
+                        difs.append(DIF(result[1],ndgObj=obj))
                     except ValueError,e:
-                        errors.append((result[0],e))
+                        errors.append((result[0],str(e)))
                 if results==[]:
                     self.html+='<p>No results for "%s"!</p>'%searchString

TI07-MOLES/trunk/PythonCode/wsgi/ndgDiscovery.config

@@ -75 +75 @@
 # needs to be mapped into a specific server ...
 badc.nerc.ac.uk: chinook.badc.rl.ac.uk
+neodc.nerc.ac.uk: chinook.badc.rl.ac.uk
 bodc.nerc.ac.uk: BODC-dummyHost
 grid.bodc.nerc.ac.uk: BODC-dumyHOST-G

TI07-MOLES/trunk/PythonCode/wsgi/ndgObject.py

@@ -6 +6 @@
     
     def __init__(self,uri,config=None):
-            
-        ''' Instantiate an ndg URI, and potentially methods for retrieving documents described by this URI.
-        
-        If discoveryOriginal is set, then it indicates that the URI provided corresponds to an original
-        URI which can be obtained both from the original database, and via transformation from the 
-        intermediate schema (aka mini-moles) database '''
+        ''' Instantiate an ndg URI, and potentially methods for retrieving documents described by this URI
+        if a config file is available.  Three default views should be available:
+            (1) a rendered html version
+            (2) a downloadable xml representation, and
+            (3) a printable xml version.
+        Real services should also be available, and at some point of course the services should be looked up 
+        at a service registry, but that's not yet available. '''
         
-        bits=uri.split(':')
+        self.gettable=-1  # The specific record is not known to be gettable via any service
+                          # other values of gettable allowed are 
+                          # 0: browseable, 1: discoverable 
+                          
+        # handle all the known ways of doing an NDG URI ...
+        bits=uri.split(':')
         bits2=uri.split('__')
         ok=1
@@ -37 +43 @@
             else: ok=0
         if not ok:
+            # after all that, we don't think it's an NDG URI ...
             raise ValueError,'URI [%s] is not a valid NDG style URI'%uri
         else:
+            # yes, it is an NDG URI ...
             self.repository,self.schema,self.localID=repository,schema,localID
         self.setConfig(config)
@@ -45 +53 @@
         ''' Set up the configuration for retrieving this document '''
         if config is None:
-            self.gettable=-1
             self.discoveryURL,self.baseURL,self.xmlURL,self.printableURL=None,None,None,None
         else:
             self.config=config
-            # this NDG object may itself be a discovery record, which makes life easy, but
+            # This NDG object may itself be a discovery record, which makes life easy, but
             # it might not be, in which case we have to build up all the possible views upon it.
             discoveryBASE='%s&uri=%s__%s__%s'%(
                 self.config.get('DISCOVERY','default'),self.repository,self.schema,self.localID)
             fmt=self.config.get('DISCOVERY','formatDefault','DIF')
+            # 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.
             self.discoveryURL=discoveryBASE+'&format=%s&type=html'%fmt
             # If this record is itself a discovery record, then we don't have much more to do
@@ -62 +71 @@
                 self.URL=self.discoveryURL
             elif self.schema in ['NDG-B0','NDG-B1']:
-                #one day we'll use a service binding to get this
-                #this is a mapping from the ndg repository id to an actual repository id
-                #understood by the ndg exist interface
+                # One day we'll use a service binding to get this
+                # This is a mapping from the ndg repository id to an actual repository id
+                # understood by the ndg exist interface
                 repository=self.config.get('NDG_B_SERVICE',self.repository,'Unknown-B-Repository')
                 url=self.discoveryURL.replace('ndg',repository)
@@ -70 +79 @@
                 self.xmlURL=self.URL.replace('html','xml')
                 self.printableURL=self.URL.replace('html','print')
-                self.gettable=0
+                if repository!='Unknown-B-Repository': self.gettable=0
             else:
                 #currently we don't know how to get this one
-                self.gettable=-1
                 self.URL='unknown'
                 self.discoveryURL,self.baseURL,self.xmlURL,self.printableURL=None,None,None,None
+                
+        #now, we'll build a stub-B url as well, in cae that comes in handy 
         if self.gettable<>-1:
             if self.schema<>'NDG-B1':

TI07-MOLES/trunk/PythonCode/wsgi/ndgRetrieve.py

@@ -41 +41 @@
         self.renderer=renderEntity(self.config)
         
-    def get(self,xml,format,otype='html',ndgObject=None):
+    def get(self,xml,format,otype='html',ndgObj=None):
         if otype=='html':
             if format=='DIF':
-                r=DIF(xml,ndgObject=ndgObject)
+                r=DIF(xml,ndgObj=ndgObj)
             elif format=='NDG-B1':
                 r=stubB(xml,self.config)
@@ -159 +159 @@
         if outputType!='xml': 
             if debug:
-                r=self.shower.get(r,format,otype=outputType,ndgObject=self.uri)
+                r=self.shower.get(r,format,otype=outputType,ndgObj=self.uri)
             else:
                 try:
-                    r=self.shower.get(r,format,otype=outputType,ndgObject=self.uri)
+                    r=self.shower.get(r,format,otype=outputType,ndgObj=self.uri)
                 except Exception,e:
                     r='<p> Unable to show document, reason was [%s]<p>'%e

TI07-MOLES/trunk/PythonCode/wsgi/renderService.py

@@ -55 +55 @@
         obj=ndgObject(testURI)
         obj.setConfig(con)
-        d=DIF(r,ndgObject=obj)
+        d=DIF(r,ndgObj=obj)
         for s in d.services:
             h=renderService(con)

TI07-MOLES/trunk/PythonCode/wsgi/stubB.py

@@ -158 +158 @@
                 self.config=config
                 self.citation=''
+                self.personnel=[] # for DIF compatiability for the moment.
                 
                 try: