Changeset 4483

Timestamp:

24/11/08 09:53:38 (12 years ago)

Author:

cbyrom

Message:

Add schemas to ndgXqueries object and add method to retrieve these + tidy up logic in a few other scripts.

Location:

exist/trunk

Files:

• python/ndgUtils/eXistInterface.py (modified) (1 diff)
• python/ndgUtils/models/existdbclient.py (modified) (1 diff)
• python/ndgUtils/ndgObject.py (modified) (4 diffs)
• python/ndgUtils/ndgXqueries.py (modified) (4 diffs)
• xquery/moles2.0.xsd (modified) (1 diff)

exist/trunk/python/ndgUtils/eXistInterface.py

@@ -113 +113 @@
         
         logging.info("Executing xquery search")
+        logging.debug(" - query: '%s'" %xquery)
         r=self.executeChunkedQuery(str(xquery),start,howmany)
         logging.info("Search complete - processing results")

exist/trunk/python/ndgUtils/models/existdbclient.py

@@ -310 +310 @@
         colData = {}
         for member in et:
-            col = member.findtext('{http://www.w3.org/2005/Atom}fileName')
-            key = data.split('/')[-1]
-            key = key.split('.')[0]
-            val = '/'.join(data.split('/')[0:-1])
-            colData[key] = val
+            collection = member.findtext('{http://www.w3.org/2005/Atom}fileName')
+            fileName = collection.split('/')[-1]
+            fileName = fileName.split('.')[0]
+            dir = '/'.join(collection.split('/')[0:-1])
+            colData[fileName] = dir
 
         logging.debug("Finished looking up atom paths")

exist/trunk/python/ndgUtils/ndgObject.py

@@ -106 +106 @@
 
         # set default return format - if not set, just return in original format
-        fmt=''
-        if self.config.has_option('DISCOVERY','formatDefault'):
-            fmt=self.config.get('DISCOVERY','formatDefault')
+        fmt = self.config.get('DISCOVERY','formatDefault')
+        if fmt:
             logging.info("Default discovery format set to: %s" %fmt)
             
@@ -120 +119 @@
         # config file should have details on the service to use for the repository
         # - if not, default to 'unknown'
-        servicehost = 'unknown'
-        if self.config.has_option('NDG_B_SERVICE',self.repository):
-            servicehost=self.config.get('NDG_B_SERVICE',self.repository)
+        servicehost = self.config.get('NDG_B_SERVICE',self.repository)
+        if not servicehost:
+            servicehost = 'unknown'
             
         # If this record is itself a discovery record, then we don't have much more to do
@@ -130 +129 @@
             self.printableURL=self.__buildURL(discoveryBASE,[qs,('format','xml')])
             self.URL=self.discoveryURL
-            if servicehost!='unknown':self.gettable=1
+            if servicehost != 'unknown':
+                self.gettable=1
         elif self.schema in self.BROWSE_SCHEMES:
             # One day we'll use a service binding to get this
@@ -141 +141 @@
             self.xmlURL=url.replace('/view/','/retrieve/')+'?format=raw'
             self.printableURL=url+'?format=xml'
-            if servicehost!='unknown': self.gettable=0
+            if servicehost !='unknown': 
+                self.gettable=0
             self.useDiscoveryService = 0
         else:

exist/trunk/python/ndgUtils/ndgXqueries.py

@@ -2 +2 @@
 import re
 class ndgXqueries(object):
-    ''' Holds a set of ndg xqueries after having read them from disk (which is
+    ''' 
+    Holds a set of ndg xqueries after having read them from disk (which is
     done in order to share the xqueries amongst different applications and 
-    programming languages). '''
+    programming languages). 
+    '''
+    ATOM_MOLES_SCHEMA = "molesAtom1.0"
     def __init__(self,directory='xquery'):
         ''' Loads up xqueries from the internal package directory '''
@@ -10 +13 @@
         # this next bit to get rid of .svn and anything else in testing
         xq=[]
+        xsd = []
         for f in files:
-            if f.find('.xq')!=-1: xq.append(f)
+            if f.find('.xq') != -1: 
+                xq.append(f)
+            elif f.find('.xsd') != -1:
+                xsd.append(f)
+                
         #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])
+        self.xq = dict([(re.sub('.xq\Z','',f),\
+                       pkg_resources.resource_string('ndgUtils','%s/%s'%(directory,f))) for f in xq])
+        self.xsd = dict([(re.sub('.xsd\Z','',f),\
+               pkg_resources.resource_string('ndgUtils',\
+                                             '%s/%s'%(directory, f))) for f in xsd])
         
         # add the various xquery libraries, too
@@ -24 +36 @@
                     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'''
@@ -33 +44 @@
         ''' Given a key, return an xquery '''
         return self.xq[key]
+    
+    def getSchema(self, schemaName):
+        '''
+        Return the specified schema
+        @param schemaName: Name of schema to retrieve - NB, use the class constants to specify the schemaName
+        - e.g. self.ATOM_MOLES_SCHEMA
+        @return: schema in string format
+        '''
+        schema =  self.xsd.get(schemaName)
+        if not schema:
+            raise ValueError("Unrecognised schema, '%s'" %schemaName)
+        
+        return schema
+        
+        
     def keys(self):
         ''' Return a list of all the xqueries loaded into this instance '''

exist/trunk/xquery/moles2.0.xsd

@@ -4 +4 @@
         xmlns:moles="http://ndg.nerc.ac.uk/schema/moles2beta"
         xmlns:atom="http://www.w3.org/2005/Atom" >
-        <xs:import namespace="http://www.w3.org/2005/Atom" schemaLocation="file:///home/cbyrom/eclipseWorkspace/ndgUtils-trunk/xquery/atom1.0.xsd" />
+        <xs:import namespace="http://www.w3.org/2005/Atom" schemaLocation="atom1.0.xsd" />
         <xs:annotation>
                 <xs:documentation>