Changeset 2089 for TI07-MOLES/trunk/PythonCode

Timestamp:

31/01/07 21:33:05 (14 years ago)

Author:

lawrence

Message:

This version of ndgSearch.py includes a test case for ticket:641 (which
is still not fixed).

File:

• TI07-MOLES/trunk/PythonCode/wsgi/ndgSearch.py (modified) (5 diffs)

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

@@ -33 +33 @@
         #self.server=loc.getDiscovery(readerclass=ExpatReaderClass,
         self.server=loc.getDiscoveryServicePortType(readerclass=ExpatReaderClass,tracefile=tracefile)
+        self.serverSessionID=None
+        self.logger=logger
+        self.__reset()
+        
+    def __reset(self):
+        ''' Initialise and/or making sure we have no hangovers from a previous call '''
         self.documents=None
         self.hits=None
-        self.serverSessionID=None
-        self.logger=logger
         self.error=None
-
+        self.response=None
+        self.status=None
     
     def search(self,term,start=1,howmany=20,target='All',scope=None,bbox=None,dateRange=None,):
         ''' Get a list of documents for a specific term using a free text search'''
         
-        
+        self.__reset()
         #if target=='Authors':
         #    request=doAuthorSearchRequest()
@@ -74 +79 @@
         if self.logger: itime=time.time()
         response=self.server.doSearch(request)
-        #try:
-        #if target=='All':
-        #    response=self.server.doFullTextSearch(request)
-        #elif target=='Authors':
-        #    response=self.server.doAuthorSearch(request)
-        #elif target=='Params':
-        #    response=self.server.doParameterSearch(request)
-        #else:
-        #    self.error=('Unknown search target type (%s)'%target,'programming error in backend')
-        #    return 
-        #except Exception,e:
-        #   raise Exception,e
-           #self.error='Error: Unable to Carry Out Search','Internal error was (%s)'%e
-        #   return
             
         if self.logger:
@@ -139 +130 @@
             etime=time.time()-itime
             self.logger.info('Document Load [n=%s] took [%ss]'%(len(self.documents._document),etime))
-        self.docs=docs
-        return self.docs
+        #self.docs=docs
+        #return self.docs
+        #removed self.docs reference Jan 31st, can't see why we had it ...
+        #nb returning a complete copy of the list didn't fix the problems with repeated calls
+        return docs
             
             
@@ -178 +172 @@
         ''' Returns all the documents in sequence in a labelled list of strings'''
         if self.hits==0: return []
-        filenames=self.documents.Document
+        #filenames=self.documents.Document
+        #so we know that the following call is the problem ...
         responses=self.getAllDocs(format)
         filenames=self.documents.Document
@@ -221 +216 @@
         output=s.getLabelledDocs()
         self.assertEqual(len(output),0)
+        
+    def testSequence(self):
+        ''' Tests that repeated searches work and can support zero responses in the middle '''
+        # this was a bug we found and needed a test case for
+        s=ndgSearch(tracefile=sys.stdout)
+        term='neodc'
+        r=s.search(term)
+        print s.hits
+        #if we uncomment this it breaks, if not it doesn't ...
+        #output=s.getLabelledDocs() 
+        #this fails as well, and we've isolated the dependency in the previous call to
+        #be on this one:
+        res=s.getAllDocs()
+        #del(output) doesn't work ...
+        term='xpabnl'
+        r=s.search(term)
+        print s.hits
+        print 'Hopefully this is also zero: if not, expect the Sequence test to fail:',s.hits
+        #output=s.getLabelledDocs()
+        #self.assertEqual(len(output),0)
+        
 
 if __name__=="__main__":