Changeset 2528

Timestamp:

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

Author:

lawrence

Message:

Improvements associated with ticket:733

Location:

TI07-MOLES/trunk/PythonCode/wsgi

Files:

• DiscoveryGUI.py (modified) (7 diffs)
• DiscoveryTemplate.py (modified) (1 diff)
• layout/ndg.css (modified) (3 diffs)
• ndgDiscovery.config (modified) (1 diff)
• ndgLog.py (modified) (1 diff)
• renderDiscoverySet.py (modified) (3 diffs)

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

@@ -138 +138 @@
         else:
             self.standardInterface()
+            
+    def message(self,message):
+        ''' Layout a message to the user '''
+        self.html='<div class="message"><p>%s</p></div>'%message
         
     
@@ -145 +149 @@
         by the DiscoveryTemplate GUI, and are: All, Authors, Parameters '''
         
+        self.oneLineSearch()
         start,howmany=int(start),int(howmany)  # url arguments need conversion ...
         
@@ -159 +164 @@
         state=self.__setState(id,searchString,hits,start,howmany)
         if hits==0: 
-            self.html+='<p> No records found </p>'
+            self.html+=self.message('No records found')
         else:
             try:
@@ -173 +178 @@
                         errors.append((result[0],str(e)))
                 if results==[]:
-                    self.html+='<p>No results for "%s"!</p>'%searchString
+                    self.html+=self.message('No results for "%s"!</p>'%searchString)
                 elif difs==[]:
-                    self.html+='<p>No usable results for "%s"!'%searchString 
+                    self.html+=self.message('No usable results for "%s"!'%searchString) 
                 else:
                     if errors<>[]:
@@ -189 +194 @@
                         self.html+=' (unfortunately %s hits matched unformattable documents from %s, an internal error has been logged):</p>'%(len(errors),dp)
                         mailError('b.n.lawrence@rl.ac.uk','DIF errors',str(errors),server=self.mailServer)
-                    self.html+=renderDiscoverySet(difs,state,config=self.config,
-                               summary=1,spatial=1,temporal=1,services=1)
+                    self.html+=renderDiscoverySet(difs,state,self.config)
             except ValueError,e:
                 if debug: 
@@ -197 +201 @@
                     self.html='<p> Error retrieving documents for %s hits is [%s]</p>'%(hits,e)
                                
-        self.standardInterface()
-        return
+        #self.standardInterface()
+        return
+                
 
     def standardInterface(self):
@@ -242 +247 @@
         return
         
-        
+    def oneLineSearch(self):
+        try:
+            discoveryURL=self.config.get('SEARCH','discoveryURL')
+        except:
+            self.message='Error, invalid configuration for search interface'
+            self.html=''
+            return
+        self.html+=DiscoveryTemplate.searchTextOneLine%locals()
+        
+        

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

@@ -151 +151 @@
 </div>'''
 
+searchTextOneLine='''
+    <div class="searchOneLine"><form action="%(discoveryURL)s">
+        New Search:&nbsp;
+        <input type="text" size="60" name="searchString"><input type="hidden" value="0" name="advanced">
+        (Target:&nbsp;<select name="textTarget">
+            <option value="Authors">Authors</option>
+            <option value="All" selected="selected">All</option>
+            <option value="Params">Parameters</option> </select>) </form>
+    </div>'''

TI07-MOLES/trunk/PythonCode/wsgi/layout/ndg.css

@@ -51 +51 @@
 
 
-tr.rbgWhite {BACKGROUND-COLOR: #FFFFFF; BORDER-BOTTOM: thin solid black;}
-tr.rbgGrey  {BACKGROUND-COLOR: #F0F0F0; BORDER-BOTTOM: thin solid black;}
-tr.rbgBeige {BACKGROUND-COLOR: #FDFFCC; BORDER-BOTTOM: thin solid black;}
-tr.separated{border-bottom:thin solid black;}
 
-#Header {color: black; background-color: white; text-align: center; margin-bottom: 10px; padding-top: 3px; padding-right: 10px; padding-left: 10px; padding-bottom: 10px; clear: both; border-bottom: 2px solid red; font-size: medium; font-weight:bold;}
 
-#ListOfResults {color: black;}
+#Header {color: black; background-color: white; text-align: center; margin-bottom: 10px; padding-top: 3px; padding-right: 10px; padding-left: 10px; padding-bottom: 10px; clear: both; border-bottom: 2px solid wheat; font-size: medium; font-weight:bold;}
+
+
 
 a img {border: none;}
@@ -65 +62 @@
 
 #simpleSearch {text-align: center; margin-top: 10px; margin-bottom: 10 px;}
+div.AdvancedSearch{margin-top: 10px; margin-bottom: 10 px;}
 
-div.AdvancedSearch{margin-top: 10px; margin-bottom: 10 px;}
+/* Result Set Controls */
+
+#ListOfResults {color: black;}
+
 div.stridePosition{margin-top: 2px; margin-bottom: 2px; background-color: wheat;}
-div.error{margin-top:2px; margin-bottom: 2px; background-color:tomato; 
-        padding-left:10px; padding-right:10px;}
+div.message {margin-top: 2px; margin-bottom: 2px; background-color: wheat;}
+div.error{margin-top:2px; margin-bottom: 2px; background-color:tomato; padding-left:10px; padding-right:10px;}
+div.searchOneLine{margin-top: 2px; margin-bottom: 2px; background-color: wheat; text-align:right;}
+tr.rbgWhite {BACKGROUND-COLOR: #FFFFFF;}
+/* *tr.rbgGrey  {BACKGROUND-COLOR: #F0F0F0;} */
+tr.rbgGrey {BACKGROUND-COLOR: #EEEEE0; }
+tr.rbgBeige {BACKGROUND-COLOR: #FDFFCC; }
+/* end of result set controls */
 
 div.searchMethod {margin-top: 7px; margin-bottom: 8px;}
@@ -83 +90 @@
     padding-top:1px; padding-left: 4px; padding-right: 4px; text-decoration:none; color:black;}
 
-#Footer  { color: #999999; background-color: #f4f4f4; text-align: center;  margin-bottom: 25px; padding-top: 3px; padding-right: 10px; padding-left: 10px; height: 49px; clear: both; border-top: 2px solid red; margin-top:10px;}
+#Footer  { color: #999999; background-color: #f4f4f4; text-align: center;  margin-bottom: 25px; padding-top: 3px; padding-right: 10px; padding-left: 10px; height: 49px; clear: both; border-top: 2px solid wheat; margin-top:10px;}
 
 

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

@@ -74 +74 @@
 badc.nerc.ac.uk: glue.badc.rl.ac.uk
 npm.ac.uk: wwwdev.npm.ac.uk/rsdas/projects/ndg
-grid.bodc.nerc.ac.uk: glue.badc.rl.ac.uk
+#grid.bodc.nerc.ac.uk: glue.badc.rl.ac.uk
+grid.bodc.nerc.ac.uk: localhost:8001
 ndg.noc.soton.ac.uk: ndg.noc.soton.ac.uk:8001
 icon: %(layout)s/B.gif

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

@@ -50 +50 @@
     '''Default error handling WSGI application.'''
     start_response(HTTPMSG, [('Content-type', 'text/plain')],
-        exc_info=sys.exc_info())
+         exc_info=sys.exc_info())
+#        sys.exc_info())
     return [ERRORMSG]    
 

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>'