Changeset 1416 for TI07-MOLES

Timestamp:

18/08/06 07:40:41 (13 years ago)

Author:

lawrence

Message:

Sundry untested modifications to browse aimed at known glitches
and bugs ...

Location:

TI07-MOLES/trunk/PythonCode/browse/portal/cgi/browse

Files:

• DiscoveryWS.py (modified) (3 diffs)
• browseCGI.py (modified) (1 diff)
• renderDiscoverySet.py (modified) (1 diff)
• renderPage.py (modified) (1 diff)

TI07-MOLES/trunk/PythonCode/browse/portal/cgi/browse/DiscoveryWS.py

@@ -19 +19 @@
                 the stride through the result set '''
         self.queryURL=queryURL
-        self.sessionID=sessionID
+        self.sessID=sessionID
         self.hits=hits
         self.offset=1
@@ -33 +33 @@
         tracefile=None,
         user=None,
-        passwd=None):
+        passwd=None
+        sessID=None) # but we can't use this last parameter ????
+        
         ''' Establish connection to wsdl proxy at self.srv with self.sessID '''
 
@@ -45 +47 @@
         self.sessID=conResp['connectReturn']
         if DEBUG: print 'Connection Made to Session: ',self.sessID
+        #
+        # how do we connect in such a way that we connect to an existing session?
+        #
 
     def SearchFullText(self,query):

TI07-MOLES/trunk/PythonCode/browse/portal/cgi/browse/browseCGI.py

@@ -272 +272 @@
             if 'SEARCHSTRING' in self.FieldStorage:
                 searchString=self.FieldStorage['SEARCHSTRING']
+                if 'searchSession' in self.FieldStorage:
+                    searchSession=self.FieldStorage['searchSession']
                 title='Search for '+searchString
                 try:
-                    ws=DiscoveryWS(wsdl=self.config.get('services','searchWSDL'))
+                    ws=DiscoveryWS(wsdl=self.config.get('services','searchWSDL'),
+                                    sessID=searchSession)
                 except Exception, e:
                     return self.error('<p>%s<br/>%s'%(e,'Unable to connect to Search BackEnd')),'Error'

TI07-MOLES/trunk/PythonCode/browse/portal/cgi/browse/renderDiscoverySet.py

@@ -104 +104 @@
     
     #now work out the links to step through a large result set
-    html+='<p>Results %s to %s of %s'%(state.offset,min(state.offset+state.stride-1,state.hits),state.hits)
+    #html+='<p>Results %s to %s of %s'%(state.offset,min(state.offset+state.stride-1,state.hits),state.hits)
+    html+='<p>Results %s to %s of %s'%(state.offset,state.offset+len(difSet),state.hits)
     if state.stride < state.hits and selector is not None:
+        #1,10,21   11,20,21  21,21,21
         if state.offset+state.stride-1<state.hits:
-            next1=state.offset+state.stride
-            nextNum=min(next1+state.stride,state.hits)+1-next1
+            next1=state.offset+state.stride   #11,21
+            nextNum=min(state.stride,1+state.hits-next1) # 10,1
             s1='Next %s'%nextNum
-            nexturl='%s&start=%s&howmany=%s'%(selector.baseURL,next1,nextNum)
+            nexturl='%s&start=%s&howmany=%s&searchSession=%s'%(
+                        selector.baseURL,next1,nextNum,state.sessID)
             html+=', %s'%hyperlink(s1,nexturl)
         if state.offset>1:
             last1=state.offset-state.stride
-            lastNum=state.stride
+            lastNum=min(state.stride,1+state.hits-last1)
             l1='Last %s'%lastNum
-            lasturl='%s&start=%s&howmany=%s'%(selector.baseURL,last1,lastNum)
+            lasturl='%s&start=%s&howmany=%s&searchSession=%s'%(
+                        selector.baseURL,last1,lastNum,state.sessID)
             html+=', %s'%hyperlink(l1,lasturl)
     else:

TI07-MOLES/trunk/PythonCode/browse/portal/cgi/browse/renderPage.py

@@ -37 +37 @@
         searchBox='''
             <form name="SEARCH" action="browse.py" method="get">
-            <input type="hidden" name="task" value="discovery"/>
-            <input type="hidden" name="dispSum" value="false"/>
             <input type="hidden" name="search" value="text"/>
             <input type="hidden" name="start" value="1"/>
-            <input type="hidden" name="orderInit" value=""/>
             <input type="hidden" name="howmany" value="10"/>
             <table border="0" cellspacing="0" cellpadding="1">