Changeset 933 for TI01-discovery

Timestamp:

16/05/06 09:53:35 (14 years ago)

Author:

lawrence

Message:

Further refactoring of DiscoveryWS in python. All the
methods are there now, but only full text works.

File:

• TI01-discovery/trunk/python/DiscoveryWS.py (modified) (4 diffs)

TI01-discovery/trunk/python/DiscoveryWS.py

@@ -37 +37 @@
     def SearchFullText(self,query):
         ''' Produce a result set from a full text query on the NDG database '''
+        #known to work.
         result = self.srv.fullText(in0=self.sessID, in1=query)
         self.result=result['fullTextReturn']
@@ -42 +43 @@
         
         
-    def __performance(self):
-        print 'QueryTime='+str(self.result['queryTime'])
-        print 'Hits='+str(self.result['hits'])
+    
+        
+    def Xquery(self,query):
+        ''' Create a result set based on an xquery over the database '''
+        #this doesn't work properly ...
+        result=self.srv.xquery(in0=query,in1=self.sessID)
+        
+    def SearchBoundingBox(self,bbox):
+        ''' Obtain a result set from a spatial search using a bounding box '''
+        print bbox
+        result = self.srv.spatialSearch(in0=self.sessID,
+               in1=bbox[0],in2=bbox[1],in3=bbox[2],in4=bbox[3])
+        print 'got a spatial result'
+        self.result=result['spatialSearchReturn']
 
+    def SearchTemporal(self,date1,date2):
+        ''' Obtain  a reset set from a temporal search using a standard
+        calendar '''
+        ok=self.__checkdates(date1)
+        ok=self.__checkdates(date2)
+        result=self.srv.temporalSearch(in0=self.sessID,in1=date1,in2=date2)
+        self.result=result['temporalSearchReturn']
         
     def GetResults(self,
@@ -68 +87 @@
         self.srv.disconnect(in0=self.sessID)
 
+    def __performance(self):
+        print 'QueryTime='+str(self.result['queryTime'])
+        print 'Hits='+str(self.result['hits'])
+        
+    def __checkdates(self,date):
+        ''' Parse date for correctness wrt web service '''
+        return 1
+
+def log(results,name):
+    
+    f=file('output.'+name,'w')
+    for r in results:f.write(r+'\n')
+    f.close()
+    
+
 if __name__ == '__main__':
 
@@ -74 +108 @@
     results=ws.GetResults(number=2)
     ws.release()
-    f=file('output.html','w')
-    for r in results:f.write(r+'\n')
-    f.close()
+    log(results,'fulltext')
+    print 'Successfully wrote full text file '
+    
+    # doesn't work
+    ss=DiscoveryWS()
+    ss.SearchBoundingBox([85.5,-49.5,166.5,-9.0])
+    results=ss.GetResults()
+    ss.release()
+    log(results,'spatial')
+    print 'got past spatial'
+    
+    #doesn't work
+    ts=DiscoveryWS()
+    ts.SearchTemporal('1999-01-01','2000-01-01')
+    results=ts.GetResults()
+    ts.release()
+    log(results,'temporal')
+    print 'got past temporal'
+
+    #doesn't work
+    xq=DiscoveryWS()
+    xquery=u"//dgMetadata/dgMetadataRecord/dgMetadataID/localIdentifier[. = 'dataent1']"
+    xq.Xquery(xquery)
+    print 'Successfully issued xquery'
+    xq.release()