Changeset 3127

Timestamp:

06/12/07 16:58:44 (13 years ago)

Author:

lawrence

Message:

This verison of ndgUtils does build to an egg. Next we need to
get dif2moles round trip testing working ... and solve
the related URL problem, and then we can work on the changes
to ndgObject which arise ... before trying to replace
the ows_server code.

Location:

exist/trunk

Files:

• makingEggs.pdf (added)
• python/ndgUtils/DiscoveryService_services.py (copied) (copied from TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/DiscoveryService_services.py)
• python/ndgUtils/DiscoveryService_services_types.py (copied) (copied from TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/DiscoveryService_services_types.py)
• python/ndgUtils/DocumentRetrieve.py (modified) (1 diff)
• python/ndgUtils/ndgObject.py (modified) (1 diff)
• python/ndgUtils/ndgRetrieve.py (modified) (1 diff)
• python/ndgUtils/ndgSearch.py (copied) (copied from TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/ndgSearch.py) (2 diffs)
• python/ndgUtils/test_ndgRetrieve.py (modified) (1 diff)
• python/ndgUtils/test_xqueries.py (modified) (1 diff)
• python/ndgUtils/wsdlUse (copied) (copied from TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/wsdlUse) (1 diff)
• python/setup.cfg (modified) (1 diff)
• python/setup.py (modified) (1 diff)

exist/trunk/python/ndgUtils/DocumentRetrieve.py

@@ -65 +65 @@
             
             #now get the real xquery
-            xq=self.xq.actual(xqtype,targetCollection,repository,localID)
+            xquery=self.xq.actual(xqtype,targetCollection,repository,localID)
             
             try:

exist/trunk/python/ndgUtils/ndgObject.py

@@ -108 +108 @@
         ''' Actually retrieve an ORIGINAL xml record corresponding to an ndg URI '''
         if self.config is None: return None
-        status,xmlh=ndgRetrieve(self.uri,self.config)
+        status,xmlh=ndgRetrieve(self,self.config)
         if status:
             return xmlh.xmls

exist/trunk/python/ndgUtils/ndgRetrieve.py

@@ -20 +20 @@
         #    actual exist repository er.
         #    I'm sure this can be cleaned up further :-)
-        try:
-            r=config.get('NDG_B_SERVICE',uri.repository)
-            sr=config.get('DEFAULT','repository')
-            er=config.get('NDG_EXIST',uri.repository)
-        except:
-            raise ValueError,'Config file not available or is incomplete'
+        #try:
+        r=config.get('NDG_B_SERVICE',uri.repository)
+        sr=config.get('DEFAULT','repository')
+        er=config.get('NDG_EXIST',uri.repository)
+        #except:
+        #    raise ValueError,'Config file not available or is incomplete'
         if r<> sr:
             if not remote:

exist/trunk/python/ndgUtils/ndgSearch.py

@@ -194 +194 @@
         return results
         
-    def get(self,repository,schema,localID,format='original',targetCollection=None):
+    def get(self,repository,schema,localID,format='DIF',**kw):
         ''' Obtain a document via it's NDG id split up '''
         #nb argument targetCollection is here to provide same API as exist xmlrpc interface
@@ -202 +202 @@
         
         
-import unittest
-
-class TestCase(unittest.TestCase):
-    
-    def testSearch(self):
-        ''' Test fundamental search capability '''
-        term='temperature'
-        s=ndgSearch()
-        howmany=10
-        docs=s.search(term,start=1,howmany=howmany)
-        print 'Asked for ',howmany,' documents (there were %s hits):'%s.hits
-        print s.documents
-       
-    def testgetLabelledDocs(self):
-        ''' Test returning of labelled documents '''
-        term='CD97'
-        s=ndgSearch()
-        r=s.search(term)
-        print s.status
-        print s.documents
-        output=s.getLabelledDocs()
-        
-    def testNoReturn(self):
-        ''' Tests a search return with (hopefully nothing to be found)'''
-        term='xpabnl'
-        s=ndgSearch()
-        r=s.search(term)
-        print 'Hopefully this is zero: if not, expect the NoReturn test to fail:',s.hits
-        output=s.getLabelledDocs()
-        self.assertEqual(len(output),0)
-        
-    def testGetDoc(self):
-        ''' Test obtaining a specific document which had better exist '''
-        doc='noc.soton.ac.uk__DIF__NOCSDAT100.xml'
-        #doc='ndg.noc.soton.ac.uk__DIF__NOCSDAT274.xml'
-        s=ndgSearch()
-        r=s.getDoc(doc)
-        
-    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()
-        term='CD97' # hopefully just get a couple of hits for now.
-        r=s.search(term)
-        print s.hits
-        #if we uncomment this it used to break, and not if uncommented, now it seems ok...
-        output=s.getLabelledDocs() 
-        #this failed as well, and we isolated the dependency in the previous call to this one.
-        #res=s.getAllDocs()
-        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
-        
-    def testGet(self):
-        ''' Tests getting via uri components '''
-        (r,s,l)='neodc.nerc.ac.uk','DIF','NEODC_ARSF_ATM_DAED'
-        ss=ndgSearch()
-        x=ss.get(r,s,l,format='DC')
-        
-    def testFailedGet(self):
-        doc='abc'
-        s=ndgSearch()
-        r=s.getDoc(doc)
-        assert 'Error' in r
-
-if __name__=="__main__":
-    unittest.main()
+

exist/trunk/python/ndgUtils/test_ndgRetrieve.py

@@ -21 +21 @@
         status,xml=ndgRetrieve(uri,self.c)
         if not status: raise ValueError(xml)
+        self.assertEqual(xml.tree.tag,'dgMetadataRecord')
         
     def testNoB(self):

exist/trunk/python/ndgUtils/test_xqueries.py

@@ -3 +3 @@
 from eXistInterface import ndg_eXist
 from ndgObject import ndgObject
+import ConfigParser
 
 class TestCase(unittest.TestCase):
     
-    def setUp(self):
+    def setUp(self): 
+        f='test.config'
+        self.c=ConfigParser.ConfigParser()
+        self.c.read(f)
         self.xq=ndgXqueries.ndgXqueries()
         self.xmldb=ndg_eXist(db='glue.badc.rl.ac.uk')
         self.testDElist=['badc.nerc.ac.uk__NDG-B1__dataent_COAPEC']
         
-    def test_molesQuery(self):
-        ''' Tests the moles query '''
-        entity=self.testDElist[0]
-        n=ndgObject(entity)
-        r=n.get()
+    def test_moles2difRoundTrip(self):
+        ''' Tests the moles 2 dif round tripping '''
+        moles1=self.testDElist[0]
+        dif1=moles1.replace('NDG-B1','DIF')
+        
         
         

exist/trunk/python/ndgUtils/wsdlUse

@@ -1 @@
-wsdl2py --lazy -b -f $1
+wsdl2py -b -f $1
+# might need -lazy for vocab server

exist/trunk/python/setup.cfg

@@ -1 +1 @@
 [egg_info]
 tag_build = .dev
+tag_svn_revision = true

exist/trunk/python/setup.py

@@ -5 +5 @@
 setup(
         name='ndgUtils',
-        version='0.1',
+        version='0.1.0',
         packages=find_packages(),
         test_suite='nose.collector',
-        package_data = {'ndgUtils':'xquery/*.xq'}
+        package_data = {'ndgUtils':['xquery/*.xq']},
+        author = 'Bryan Lawrence',
+        license = 'LGPL',
+        description = 'NDG utilities for metadata search and extraction',
+        long_description='''
+This is a package of utilities for manipulating metadata
+documents conforming to NERC DataGrid specifications, and
+held in eXist databases. Utilities to manipulate the
+NERC DataGrid public SOAP search interface are also 
+included '''
 )