Changeset 2528 for TI07-MOLES/trunk/PythonCode/wsgi/renderDiscoverySet.py

Timestamp:

30/05/07 16:44:15 (12 years ago)

Author:

lawrence

Message:

Improvements associated with ticket:733

File:

• TI07-MOLES/trunk/PythonCode/wsgi/renderDiscoverySet.py (modified) (3 diffs)

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

@@ -49 +49 @@
     
         
-def renderDiscoverySet(difSet,state,config,summary=0,services=0,spatial=0,temporal=0,
-    linkto='NDG_B_SERVICE',selector=None):
+def renderDiscoverySet(difSet,state,config, linkto='NDG_B_SERVICE',selector=None):
     '''Takes a set of xml DIFS from a discovery search (difSet) and renders a 
-    list of responses as a table, 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,
+    list of responses as a table. The argument is 
             linkto (string) - clicking on the select widget should add the url for
                               this service to the selected list
@@ -67 +62 @@
     # List of methods which deal with the actual row content ...
     #   
-    
-    def row(rowList,bgcolor='rbgWhite'):
-        h='<tr class="%s">'%bgcolor
-        for item in rowList:
-            if type(item)==type((1,2)):
-                h+='<td colspan="%s">%s</td>'%(item[1],item[0])
-            else:h+='<td>%s</td>'%item
-        h+='</tr>'
-        return h#span(h,bgcolor)
-
+    def doubleheader(args):
+        return '''<table><tbody><tr><td colspan="2" align="center">%s</td></tr>
+                  <tr><td align="center">%s</td><td align="center">%s</td></tr></tbody></table>'''%args
+    def row(rowlist,rclass='rbgWhite'):
+        print rowlist
+        r= '''<tr class="%s"><td width="70%%">%s</td><td width="12%%" align="center">%s</td>
+            '''%(rclass,rowlist[0],rowlist[1])
+        ll=len(rowlist)
+        print 'BBB[',rowlist[2:],']'
+        
+        if ll==3:
+            r+='<td align="center" colspan="2" width="12%%">%s</td></tr>'%rowlist[2]
+        elif ll==4:
+            r+='<td align="center">%s</td><td align="center">%s</td></tr>'%tuple(rowlist[2:])
+        else:
+            raise 'Coding error in renderDiscovery'
+        print 'ok'
+        return r
+        
     def spatialBox(elem):
         return elem.bbox.toHTMLbox()
@@ -107 +111 @@
     # ##################################
     
-    # depending on keyword options, provide column headings
-    #
+    # previous versions of this code had options, but let's simplify this a lot ...
     
-    columns=['Dataset',]   
-    if spatial: columns.append('Location')
-    if temporal: 
-        #two columns for temporal but put a column header across both columns
-        header='''<table><tbody><tr><td colspan="2" align="center">Time&nbsp;Coverage</td></tr><tr>
-        <td align="center">Start</td><td align="center"> End</td></tr></tbody></table>'''
-        columns.append((header,2))
-    html='<table><tbody>'+row(columns,bgcolor="rbgBeige")
+    spatial=doubleheader(('Spatial&nbsp;Coverage','(-ve:W,S;','+ve:N,E)'))
+    temporal=doubleheader(('Temporal&nbsp;Coverage','Start','End'))
+    columns=['Dataset',spatial,temporal] 
+    html='<table><tbody>'+row(columns,rclass="rbgBeige")
     
     # ok, now let's cycle through the hits
     i=1
     for item in difSet:
-        #print item.entryID
         d=item # we used to do the diffing here ... but we don't anymore
         bgc={1:'rbgWhite',-1:'rbgGrey'}[i]
         i=-1*i
-        if debug: print 'Rendering ',d.entryID
         if d.tree is None:
-            html+='<tr class="%s"><td colspan="%s"> Unparseable record </td></tr>'%(bgc,len(columns))
+            html+='<tr class="%s"><td colspan="4"> Unparseable record </td></tr>'%bgc
         else:
             ndg,slist=serviceList(d)
             rlist=['',]
-            if summary:
-                if d.briefCitation <>'':
-                    rlist[0]='%s: %s'%(span('Citation','ndgem'),d.briefCitation)
-                else:
-                    rlist[0]='%s: %s'%(span('Title','ndgem'),abbreviate(d.name,60))
-                rlist[0]+='<br/>%s: %s'%(span('Summary','ndgem'),abbreviate(d.abstract,200))
-                if d.binding is not None: rlist[0]+=' '+hyperlink('(more)',d.binding.url)
+            if d.briefCitation <>'':
+                rlist[0]='%s: %s'%(span('Citation','ndgem'),d.briefCitation)
+            else:
+                rlist[0]='%s: %s'%(span('Title','ndgem'),abbreviate(d.name,60))
+            rlist[0]+='<br/>%s: %s'%(span('Summary','ndgem'),abbreviate(d.abstract,200))
+            if d.binding is not None: rlist[0]+=' '+hyperlink('(more)',d.binding.url)
             rlist[0]+='<br/>%s: %s.'%(span('Repository','ndgem'),d.centre.url())
-            if not summary and d.binding is not None:
-                rlist[0]+=' '+hyperlink('(more)',d.binding.url)
-            if services:rlist[0]+=slist
+            rlist[0]+=slist
             if ndg and selector !=None: 
                 rlist[0]+=',&nbsp;'+selector.target(d.entryID,name=d.abbreviation)
-            if spatial: rlist.append(spatialBox(d))
-            if temporal: 
-                rlist.append(htmlTime(d.timeCoverage[0]))
-                rlist.append(htmlTime(d.timeCoverage[1]))
-            html+=row(rlist,bgcolor=bgc)
-        print 'Completed rendering ',d.entryID
+            rlist.append(spatialBox(d))
+            rlist.append(htmlTime(d.timeCoverage[0]))
+            rlist.append(htmlTime(d.timeCoverage[1]))
+            html+=row(rlist,rclass=bgc)
 
     html+='</tbody></table>'