Changeset 996

Timestamp:

24/05/06 10:18:57 (16 years ago)

Author:

lawrence

Message:

Further changes associated with the browse/discovery
look and feel

Location:

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

Files:

• DIF.py (modified) (1 diff)
• ETxmlView.py (modified) (1 diff)
• browseCGI.py (modified) (8 diffs)
• renderDiscoverySet.py (moved) (moved from TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi/renderDiscoveryResponses.py) (2 diffs)
• renderPage.py (modified) (1 diff)

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

@@ -41 +41 @@
                 value=item.text
                 if value not in match[level]: match[level].append(value)
-        print self.parameters
-            
+        
         #load up information about spatial bounding box 
         self.bbox=Bounding(self.elem,entity='DIF')

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

@@ -7 +7 @@
 
 import ElementTree as ET
+import re
 
 def et2text(elem,indent='',html=0,space='   '):

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

@@ -15 +15 @@
 from renderEntity import renderEntity
 from renderPage import renderPage
+from renderDiscoverySet import renderDiscoverySet
 from Utilities import *
 from ETxmlView import *
+from DiscoveryWS import *
 
 import Cookie
@@ -25 +27 @@
         to work with the discovery portal as well '''
         
-        def __init__(self,cookie,url,config):
+        def __init__(self,cookie,config):
                 
                 '''Instantiate with an unsecured browse session (security only
@@ -34 +36 @@
                 self.history=RingBuffer(10)
                 self.__loadBrowseHistory()
-                self.url=url 
         
         def __toXML(self):
@@ -96 +97 @@
                 ''' This method actually responds to the user'''
                 
-                #Instantiate the Session Environment
+                self.ViewTextOnly,self.ViewXML=0,0
+                
+                #Instantiate the Session Environment
                 self.cookie=self.env.get('HTTP_COOKIE',None)
-
+                self.session=BrowseSession(self.cookie,self.config)
+                if self.config.logfile is not None: self.config.log(self.cookie)
+                
                 #this will do for the moment, although I'd rather the whole
                 #URI was self consistent ...
                 
+                #use name as an error return as well in the following calls ...
                 if self.FieldStorage.has_key('uri'):
                         self.uri=self.FieldStorage['uri'].value
-                else: 
+                        content,name=self.__browse()
+                elif self.FieldStorage.has_key('search'):
+                        self.searchType=self.FieldStorage['search'].value
+                        content,name=self.__search()
+                else: 
                         self.response.content=self.error('No valid URI')
                         return self.response
-                
-                self.ViewTextOnly,self.ViewXML=0,0
+               
+                if not self.ViewTextOnly and name !=0:
+                    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,name,self.config)
+                else:
+                    self.response.content=content
+                return self.response
+                
+        def __browse(self):
+                ''' Handle orthodox browsing '''
+                
                 if self.FieldStorage.has_key('text'):
                     self.ViewTextOnly=1
@@ -116 +139 @@
                 if self.FieldStorage.has_key('ndgSec'):
                     pass
-                    
-                self.session=BrowseSession(self.cookie,self.uri,self.config)
-                
-                if self.config.logfile is not None: self.config.log(self.cookie)
-                
+                
                 #this is where we invoke NDG security setup
                 self.makeGateway()
@@ -133 +152 @@
                 if self.b.xml is None:
                     content=self.error('Unable to obtain stub-B from database')
+                    return content,0
                 else:
                     self.session.addToHistory(self.b.Burl,self.b.abbreviation)
@@ -146 +166 @@
                         access=1
                     if access:
+                        name=self.b.name
                         if self.ViewTextOnly:
                             self.response.contentType='text/plain'
@@ -154 +175 @@
                             content=self.b.toHTML()
                     else:
+                        name='NDG Browse'
                         content=result
-                
-                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)
-                else:
-                    self.response.content=content
-                
-                return self.response
-                
+
+                    return content,name
+                
+        def __search(self):
+            ''' Handle simple searching within the context of the browse '''
+            if self.FieldStorage.has_key('SEARCHSTRING'):
+                searchString=self.FieldStorage['SEARCHSTRING'].value
+                ws=DiscoveryWS()
+                ws.SearchFullText(searchString)
+                results=ws.GetResults(number=5)
+                difs=[]
+                for result in results:
+                    difs.append(xmlCleanup(result))
+                html=renderDiscoverySet(difs,summary=1,spatial=1,temporal=1)
+                title='Search for '+searchString
+                return html,title
+            else:
+                return self.error('No valid search optoin'),0
+              
         def error(self,message):
                 ''' Construct a nice formal response, but don't throw a 404 ... '''

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

@@ -18 +18 @@
         h='<tr bgcolor="%s">'%bgcolor
         for item in rowList:
-            print item
             if type(item)==type((1,2)):
                 h+='<td colspan="%s">%s</td>'%(item[1],item[0])
@@ -78 +77 @@
     from ETxmlView import xmlCleanup
     ws=DiscoveryWS()
-    ws.SearchFullText('acsoe')
+    ws.SearchFullText('humidity')
     results=ws.GetResults(number=5)
     difs=[]
+    g=file('log.xml','w')
     for result in results:
+        g.write(xmlCleanup(result)+'\n')
         difs.append(xmlCleanup(result))
     html=renderDiscoverySet(difs,summary=1,spatial=1,temporal=1)

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

@@ -17 +17 @@
         #set up search box form ...
         searchBox='''
-            <FORM NAME="SEARCH" ACTION="http://ndg.nerc.ac.uk/discovery/Task" METHOD="POST>
+            <FORM NAME="SEARCH" ACTION="browse.py" METHOD="POST>
             <INPUT TYPE="HIDDEN" NAME="task" VALUE="discovery"/>
             <INPUT TYPE="HIDDEN" NAME="dispSum" VALUE="false"/>