Changeset 911

Timestamp:

10/05/06 20:19:31 (14 years ago)

Author:

lawrence

Message:

Refactoring browse portal to clearly separate out the service bindings.

Location:

TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi

Files:

• ServiceBinding.py (added)
• browse.config (modified) (1 diff)
• renderEntity.py (modified) (2 diffs)
• stubB.py (modified) (7 diffs)

TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi/browse.config

@@ -3 +3 @@
 #
 [db]
-exist:          xmldb:exist://glue.badc.rl.ac.uk:8080/exist/xmlrpc
+exist:          xmldb:exist://superglue.badc.rl.ac.uk:8080/exist/xmlrpc
+#exist:                 xmldb:exist://glue.badc.rl.ac.uk:8080/exist/xmlrpc
 
 [layout]

TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi/renderEntity.py

@@ -91 +91 @@
                         else:
                            html+='<td>public</td><td></td>'
-                        html+='<td>%s</td></tr>'%g.binding()    
+                        html+='<td>%s</td></tr>'%g.Aurl 
                 html+='</tbody></table>'
                 return html
@@ -119 +119 @@
 if __name__=="__main__":
         from stubB import stubB
-        x=stubB('../../exampleB/methyl.example.xml',xsltMethod='local')
-        html=renderEntity(x)
+        xml=open('../../exampleB/methyl.example.xml').read()
+        x=stubB(xml,makeHTML=renderEntity)
+        html=x.toHTML()
         f=open('output.html','w')
         f.write(html)
-        print x.related
+        
         
 

TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi/stubB.py

@@ -8 +8 @@
 from renderEntity import renderEntity
 from Utilities import *
+from ServiceBinding import *
         
 class AccessControl:
+        
+        ''' Handle the access control metadata and provide three attributes of the 
+        access control: exists (existence), status (modified elsewhere for whether
+        user can access data), and html (a message about the constraints). '''
+        
         def __init__(self,e):
-                self.status=1
-                self.exist=1
-                self.html='constraints'
+                if e is None:
+                        self.status=1
+                        self.exist=0
+                        self.html=''
+                else:
+                        self.status=1
+                        self.exist=1
+                        self.html='constraints'
         
 class Name:
@@ -91 +102 @@
                 self.elem=elem
                 self.constraints=AccessControl(elem.find('accessControlPolicy'))
-        def binding(self):
-                #dummy for now
-                return 'Alink'
+                self.binding=ServiceBinding('A',elem.find('dataModelID'))
+                self.Aurl=self.binding.url
         
 class DataEntity:
@@ -139 +149 @@
         ''' Holds the stub-b document and provides methods which get and manipulate it '''
         
-        def __init__(self,xml,makeHTML=None):
+        def __init__(self,xml,makeHTML=None, ServiceBinding=ServiceBinding):
                 
                 '''Instantiate by parsing an xml document passed in as a string '''
@@ -158 +168 @@
                         return
                 
+                #Note that the root of the ElementTree instance is dgMetadataRecord
+                #so we don't need (or want) that in our xpath expressions.
+                
                 self.constraints=AccessControl(self.tree.find('dgMetadataRecord/dgMetadataSecurity'))
-                self.related=[]
-                
-                #note that the root of the ElementTree instance is dgMetadataRecord
-                #so we don't need (or want) that in our xpath expressions.
-                host='' #bodge
-                #this long ifelif sequence needs to go out of moles ...
                 self.abbreviation=wrapGetText(self.tree,'abbreviation')
+                
                 elem=self.tree.find('dgDataEntity')
                 if elem is not None:
@@ -171 +179 @@
                         self.type='dgDataEntity'
                         self.others=('activity','observationstation','dataproductiontool')
+                        
                 elem=self.tree.find('dgActivity')
-                
                 if elem is not None:
                         self.type='dgActivity'
                         self.others=('dgDataEntity','observationstation','dataproductiontool')
+                        
                 elem=self.tree.find('dgDataProductionTool')
                 if elem is not None:
                         self.type='dgDataProductionTool'
                         self.others=('dgDataEntity','observationstation','activity')
+                
                 elem=self.tree.find('dgObservationStation')
                 if elem is not None:
@@ -186 +196 @@
 
                 self.abstract=wrapGetText(self.tree,'dgMetadataDescription/abstract/abstractText')
-                service='cgi/browse.py'
-                self.Burl=self.bind2service(host,service,self.tree.find('dgMetadataID'))
+                
+                self.binding=ServiceBinding('B',self.tree.find('dgMetadataID'))
+                self.Burl=self.binding.url
                 
                 # now go get all the related links
-                
+                self.related=[]
                 for related in self.tree.findall(self.type+'/RelatedDeployment'):
                         deployment=['empty',[]]  #something should eventually go in the empty slot ...
@@ -199 +210 @@
                                         for subitem in subitems:
                                                 name=wrapGetText(subitem,'name')
-                                                url=self.bind2service(host,service,subitem.find('dgMetadataID'))
-                                                aa.append([name,url])
+                                                binding=ServiceBinding('B',subitem.find('dgMetadataID'))
+                                                aa.append([name,binding.url])
                                         deployment[1].append([self.labels[item],aa])
                         self.related.append(deployment)
-                
-        def bind2service(self,host,service,ndgElement):
-                '''Takes the various parts of an  id and bind to a service to produce a URL'''
-                ### very temporary code ###
-                try:
-                        repID=ndgElement.find('repositoryIdentifier').text
-                        url='%s/%s?uri=%s/%s'%(host,service,repID,ndgElement.find('localIdentifier').text)
-                        return url
-                except:
-                        return 'No link'
         
         def toHTML(self):