Changeset 3840

Timestamp:

01/05/08 14:20:37 (13 years ago)

Author:

cbyrom

Message:

Adjust ndgutils setup to allow the inclusion of the xquery lib files
+ adjust the ndgXqueries script to allow the easy retrieval of
these files.

Location:

exist/trunk/python

Files:

• ndgUtils/ndgDirectory.py (modified) (1 diff)
• ndgUtils/ndgXqueries.py (modified) (1 diff)
• setup.py (modified) (1 diff)

exist/trunk/python/ndgUtils/ndgDirectory.py

@@ -21 +21 @@
         #get the right namespace
         self.ns={'DIF':'http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/','MOLES':'http://ndg.nerc.ac.uk/moles','MDIP':'http://www.oceannet.org/mdip/xml'}[docType]
-        #select the query
+        #load all queries
         queries=ndgXqueries.ndgXqueries()
+        #select the right query according to the docType
         xqName={'DIF':'DIFList','MOLES':'molesList', 'MDIP':'MDIPList', 'moles':'molesList'}[docType]
         self.docType=docType
         xq=queries[xqName]
+        # set the query up with the correct target collection
         self.xq=xq.replace('TargetCollection',self.targetCollection)
        

exist/trunk/python/ndgUtils/ndgXqueries.py

@@ -14 +14 @@
         #remember that .rstrip doesn't quite do what you think it does :-)
         self.xq=dict([(re.sub('.xq\Z','',f),pkg_resources.resource_string('ndgUtils','%s/%s'%(directory,f))) for f in xq])
+        
+        # add the various xquery libraries, too
+        self.xqlib=dict()
+        dirs = ['xqueryLib/Vocabs', 'xqueryLib/Utilities', 'xqueryLib/StubB']
+        for dir in dirs:
+            files = pkg_resources.resource_listdir('ndgUtils', dir)
+            for f in files:
+                if f.find('.xquery') == -1: 
+                    continue
+
+                #re.sub('.xquery\Z','',f)] = \
+                self.xqlib[f] = pkg_resources.resource_string('ndgUtils','%s/%s'%(dir,f))
+            
     def __setitem__(self,key,value):
         ''' Add a new xquery to the xquery database dynamically'''

exist/trunk/python/setup.py

@@ -9 +9 @@
         packages=find_packages(),
         test_suite='nose.collector',
-        package_data = {'ndgUtils':['xquery/*.xq']},
+        package_data = {'ndgUtils':['xquery/*.xq','xqueryLib/*/*.xquery']},
         author = 'Bryan Lawrence',
         license = 'LGPL',