Changeset 976

Timestamp:

22/05/06 16:40:48 (13 years ago)

Author:

lawrence

Message:

Minor bug fixes to various browse code bits and bobs ...

Location:

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

Files:

• ETxmlView.py (modified) (2 diffs)
• browse.config (modified) (1 diff)
• browseCGI.py (modified) (5 diffs)
• insecure.py (modified) (2 diffs)
• renderEntity.py (modified) (4 diffs)
• stubB.py (modified) (2 diffs)

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

@@ -23 +23 @@
         if children:
                 for item in elem:
-                        result+='\n'+PrettyPrint(item,indent=indent+space)
+                        result+='\n'+et2text(item,indent=indent+space)
                 result+='\n%s%s</%s>'%(indent,estrip(item.tail),elem.tag)
         else:
@@ -58 +58 @@
     if children:
         for item in elem:
-            result+=PrettyPrintHTML(item,matchList)
+            result+=et2html(item,matchList)
         result+='%s%s/%s%s'%(match(item.tail),lt,span(elem.tag,'xmlElemTag'),gt)
     else:

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

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

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

@@ -16 +16 @@
 from renderPage import renderPage
 from Utilities import *
+from ETxmlView import *
 
 import Cookie
@@ -103 +104 @@
                         self.uri=self.FieldStorage['uri'].value
                 else: 
-                        return self.error('No valid URI')
+                        self.response.content=self.error('No valid URI')
+                        return self.response
                 
                 self.ViewTextOnly,self.ViewXML=0,0
@@ -110 +112 @@
                 elif self.FieldStorage.has_key('xml'):
                     self.ViewXML=1
+
                 
                 self.session=BrowseSession(self.cookie,self.uri,self.config)
                 if self.config.logfile is not None: self.config.log(self.cookie)
-                
-                #Handle authorisation
-                self.ac=self.session.getCredentials()
                 
                 #get the xml document
@@ -136 +136 @@
                     if access:
                         if self.ViewTextOnly:
-                            self.response.contentType='text/text'
+                            self.response.contentType='text/plain'
                             content=et2text(self.b.tree)
-                        elif self.ViewXML=1:
-                            content=et2HTML(self.b.tree)
+                        elif self.ViewXML==1:
+                            #self.response.contentType='text/html'
+                            content=et2html(self.b.tree)
                         else:
                             content=self.b.toHTML()
@@ -152 +153 @@
                     self.response.content=renderPage(
                         content,historyHTML,historyHTML,self.b.name,self.config)
+                else:
+                    self.response.content=content
                 
                 return self.response

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

@@ -31 +31 @@
                 return 0,s
 
-def insecureGetDoc(uri,db='xmldb:exist://glue.badc.rl.ac.uk:8080/exist/xmlrpc', jar='./returnmoles.jar'):
+def insecureGetDoc(uri,db='glue.badc.rl.ac.uk', jar='./returnstubb.jar'):
         ''' Use Kevin's code to get the document from exist '''
         #we assume the URI is of the form repository/localid
         #we don't use os.path.split, because this is os indpendent.
+        edb='xmldb:exist://%s:8080/exist/xmlrpc'%db
         try:
                 repPath,localID=uri.split('/')
         except:
                 return None
-        returnMolesJar=jarLoc(jar)
-        cmd='java -jar %s %s %s %s'%(
-        returnMolesJar,repPath,localID, db)
-        status,result=commands.getstatusoutput(cmd)#osCommand(cmd)
+        #we can hash all this up properly later ...
+        #this file should exist (for the moment) in the cgi directory ...
+        #I know that's not very tidy, but it doesn't matter for the moment ...
+        f=file('passwords.txt','r')
+        pw={}
+        for host in f.readlines():
+            h=host.strip().split(' ')
+            pw[h[0]]=h[1],h[2]
+        #try:
+        returnMolesJar=jarLoc(jar)
+        cmd='java -jar %s repositoryID %s localID %s repository %s user %s userpw %s '%(
+               returnMolesJar,repPath,localID, edb, pw[db][0], pw[db][1])
+        status,result=commands.getstatusoutput(cmd)
+        #except:
+        #    return None
         if status: 
                 return None
@@ -76 +88 @@
 if __name__=="__main__":
         #d= insecureGetDoc('badc.nerc.ac.uk/dataent13',jar='../returnmoles.jar')
-        d= insecureGetDoc('badc.nerc.ac.uk/activity3',jar='../returnmoles.jar')
+        d= insecureGetDoc('badc.nerc.ac.uk/dataent1',db='gepidae.esc.rl.ac.uk',
+            jar='../returnstubb.jar')
         print d
         #print d

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

@@ -12 +12 @@
 
         #try:
-        contentHTML=renderContent(entity)
+        
         #except:
         #       contentHTML=''
@@ -20 +20 @@
         else:
                 relatedHTML=''
-                
+
+        
         if entity.type=='dgDataEntity':
+                contentHTML=renderDataContent(entity)
                 relatedHTML=renderGranules(entity)+relatedHTML
         elif entity.type=='DIF':
+                contentHTML=renderDataContent(entity)
                 relatedHTML=renderDataLinks(entity)+relatedHTML
+        else:
+                contentHTML=''
 
         html='''
@@ -39 +44 @@
         return html
 
-def renderContent(entity):
-        '''Parse the entity for content information '''
+def renderDataContent(entity):
+        '''Parse a data entity for content information '''
         
         html=''
@@ -56 +61 @@
                         </tr>'''
                         
-        for item in entity.parameters:
+        
+        try:
+        #currently all entities are parsed for these ... 
+            for item in entity.parameters:
                 html+='''
                         <tr><td class="line"><b>Parameter</b><br/></td>
                         <td class="line">%s</td></tr>'''%item
         
-        html+='''
+            html+='''
                 <tr><td class="line"><b>Spatial Coverage</b><br/></td>
                         <td class="line">%s</td></tr>'''%entity.bbox.toHTML()
         
-        html+='''
+            html+='''
                 <tr><td class="line"><b>Temporal Coverage</b><br/></td>
                         <td class="line">%s</td></tr>'''%entity.timeCoverage
         
+        except: pass
+        
         html+='''
                 <tr><td class="line"><b>Data Curator</b><br/></td>

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

@@ -20 +20 @@
                 self.binding=ServiceBinding('A',elem.find('dataModelID'))
                 self.Aurl=self.binding.url
+                
+                
+class ObservationStation:
+    def __init__(self,e):
+        self.e=e
+        if e is None: return
+class DataProductionTool:
+    def __init__(self,e):
+        self.e=e
+        if e is None: return
+class Activity:
+    def __init__(self,e):
+        self.e=e
+        if e is None: return
+class Deployment:
+    def __init__(self,e):
+        self.e=e
+        if e is None: return
         
 class DataEntity:
@@ -63 +81 @@
 
 
-class stubB(DataEntity):
+class stubB(DataEntity,Deployment,ObservationStation,DataProductionTool,Activity):
         
         ''' Holds the stub-b document and provides methods which get and manipulate it '''