Changeset 963

Timestamp:

19/05/06 13:19:32 (14 years ago)

Author:

lawrence

Message:

Coding to support showing full xml documents etc in browse, note
not tested as underlying web services not workign at moment.

Location:

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

Files:

• DIF.py (modified) (1 diff)
• ETxmlView.py (added)
• Utilities.py (modified) (3 diffs)
• browseCGI.py (modified) (2 diffs)
• renderDiscoveryResponses.py (modified) (4 diffs)

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

@@ -16 +16 @@
         '''Initialise a python dif instance based on an xml document '''
         self.metadataType='DIF'
+        self.xml=xml
         self.elem=ET.fromstring(xml)
         self.renderMethod=renderMethod

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

@@ -3 +3 @@
 import os
 import re
-
-def cleanup(string):
-    '''This is a hack to make sure that xml doesn't contain any naughty & characters alone'''
-    #match ? but not (?! if it's followed by alphanumeric \w characters + and a semicolon ;
-    return re.sub(r'&(?!\w+;)', '&', string)
 
 class myConfig:
@@ -32 +27 @@
 class Response:
         ''' Holds all the parts of the response to an HTML get or post '''
-        def __init__(self):
+        def __init__(self,content='text/html'):
                 self.headers=[]
                 self.cookie=None
-                self.contentType='text/html'
+                self.contentType=content
                 self.content=''
         def write(self,out):
@@ -73 +68 @@
         else: return rr[0] 
 
-def PrettyPrint(elem,indent='',html=0,space='   '):
-        '''Lightweight pretty printing of elementTree elements'''
-        def estrip(elem):
-                ''' Just want to get rid of unwanted whitespace '''
-                if elem is None:
-                        return ''
-                else:
-                        return elem.strip()
-        strAttrib=''
-        for att in elem.attrib:
-                strAttrib+=' %s="%s"'%(att,elem.attrib[att])
-        result='%s<%s%s>%s'%(indent,elem.tag,strAttrib,estrip(elem.text))
-        children=len(elem)
-        if children:
-                for item in elem:
-                        result+='\n'+PrettyPrint(item,indent=indent+space)
-                result+='\n%s%s</%s>'%(indent,estrip(item.tail),elem.tag)
-        else:
-                result+='</%s>'%(elem.tag)
-        return result
+
         
-def PrettyPrintHTML(elem,matchList=[]):
-    '''Lightweight HTML pretty printing of elementTree elements + highlight
-    any words which occur in the element text (and tails) which occur in matchList,
-    and formatted using a css something like this:
-    ===
-    DIV.xmlElem {PADDING-LEFT: 20px;}
-    .xmlAttrVal {COLOR:Red; }
-    .xmlAttrTyp {COLOR:Green; }
-    .xmlElemTag {COLOR:Blue; }
-.   highlight {BACKGROUND-COLOR:Yellow; }
-    ===
-    '''
-    def span(x,c): return '<span class="%s">%s</span>'%(c,x)
-    def div(x,c): return '<div class="%s">%s</div>'%(c,x)
-    def match(x): 
-        if x is None: return ''
-        for w in matchList: x=re.sub(w,span(w,'highlight'),x)
-        return x
-    lt,gt='<b>&lt;</b>','<b>&gt;</b>'
-    strAttrib=''
-    for att in elem.attrib:
-        strAttrib+=' %s="%s"'%(span(att,'xmlAttrTyp'),span(elem.attrib[att],'xmlAttrVal'))
-    result='%s%s%s%s%s'%(lt,span(elem.tag,"xmlElemTag"),strAttrib,gt,match(elem.text))
-    children=len(elem)
-    if children:
-        for item in elem:
-            result+=PrettyPrintHTML(item)
-        result+='%s%s/%s%s'%(match(item.tail),lt,span(elem.tag,'xmlElemTag'),gt)
-    else:
-        result+='%s/%s%s'%(lt,span(elem.tag,'xmlElemTag'),gt)
-    return div(result,'xmlElem')
+
 
 if __name__=="__main__":

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

@@ -105 +105 @@
                         return self.error('No valid URI')
                 
+                self.ViewTextOnly,self.ViewXML=0,0
+                if self.FieldStorage.has_key('text'):
+                    self.ViewTextOnly=1
+                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)
@@ -129 +135 @@
                         access=1
                     if access:
-                        content=self.b.toHTML()
+                        if self.ViewTextOnly:
+                            self.response.contentType='text/text'
+                            content=et2text(self.b.tree)
+                        elif self.ViewXML=1:
+                            content=et2HTML(self.b.tree)
+                        else:
+                            content=self.b.toHTML()
                     else:
                         content=self.error('No access to Secure Metadata')
                 
-                historyHTML='<p>'
-                for item in self.session.getHistory():
-                        historyHTML+='<a href="%s">%s</a><br/>'%item
-                historyHTML+='</p>'
-                self.response.content=renderPage(
+                if not self.ViewTextOnly:
+                    historyHTML='<p>'
+                    for item in self.session.getHistory():
+                        historyHTML+='<a href="%s">%s</a><br/>'%item
+                    historyHTML+='</p>'
+                    self.response.content=renderPage(
                         content,historyHTML,historyHTML,self.b.name,self.config)
-                return self.response
+                
+                return self.response
                 
         def error(self,message):

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

@@ -1 +1 @@
 from DiscoveryWS import DiscoveryWS
 from DIF import DIF
-from Utilities import cleanup
 
-def render(difSet,summary=0,services=0,spatial=0,temporal=0,linkto='NDG_B_SERVICE'):
+
+def render(difSet,summary=0,services=0,spatial=0,temporal=0,
+    linkto='NDG_B_SERVICE'):
     '''Takes a set of xml DIFS from a discovery search and renders a list of responses as a table,
-    with layout depending on a set of keywords'''
+    with layout depending on a set of keywords:
+            summary (boolean) - show the abstract,
+            services (boolean) - show the service list,
+            spatial (boolean) - show the bounding box,
+            temporal (boolean) - show the date range,
+            linkto (string) - clicking on the name should go to a service binding to this url
+            '''
+    #
     # List of methods which deal with the actual row content ...
-    columns=['Dataset','Repository']
-        
+    #   
     def row(rowList,bgcolor='#EEEEEE'):
         h='<tr bgcolor="%s">'%bgcolor
@@ -25 +32 @@
         return ''
    
-    def serviceList(elem):
+    def serviceList(elem,linkDefault):
         return ''
-        
-    #next three lines not yet used in anger
+    
+    # ##################################
+    # Actual html production follows
+    # ##################################
+    
+    # depending on keyword options, provide column headings
+    #
+    columns=['Dataset','Repository']   
     if spatial: columns.insert(-1,'Location')
     if temporal: 
         #two columns for temporal but put a column header across both columns
-        header='''<table><tr><td colspan="2">Temporal Coverage</td></tr><tr>
-        <td>Start Date</td><td> End Date</td></tr></table>'''
+        header='''<table><tr><td colspan="2" align="center">Temporal Coverage</td></tr><tr>
+        <td align="center">Start Date</td><td align="center"> End Date</td></tr></table>'''
         columns.insert(-1,(header,2))
     if services: columns.insert(-1,'Services')
-    html='<table><tbody>'+row(columns,bgcolor="#FDFFCC")
+    html='<div class="ListOfResults"><table><tbody>'+row(columns,bgcolor="#FDFFCC")
+    
+    # ok, now let's cycle through the hits, nb, look and feel should be
+    # factored out to css ..
     
     i=1
@@ -52 +68 @@
             rlist.insert(-1,d.timeCoverage[0])
             rlist.insert(-1,d.timeCoverage[1])
-        if services: rlist.insert(-1,serviceList(d))
+        if services: rlist.insert(-1,serviceList(d,linkto))
         
         html+=row(rlist,bgcolor=bgc)
  
-    html+='</tbody></table>'
+    html+='</tbody></table></div>'
     return html
 
 if __name__=="__main__":
+    
+    from ETxmlView import xmlCleanup
     ws=DiscoveryWS()
     ws.SearchFullText('acsoe')
@@ -65 +83 @@
     difs=[]
     for result in results:
-        difs.append(cleanup(result))
+        difs.append(xmlCleanup(result))
     html=render(difs,summary=1,spatial=1,temporal=1)
     f=file('output.html','wb')