Changeset 2677

Timestamp:

02/07/07 09:27:38 (14 years ago)

Author:

domlowe

Message:

get_csml_doc method updated to include exist access. Working with cache except cache does not respect security yet

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/csml_wcs.py (modified) (3 diffs)
• lib/base.py (modified) (1 diff)
• lib/csml_util.py (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs.py

@@ -30 +30 @@
 from email import encoders
 
-from ows_server.controllers.status import StatusController
-from ows_server.models import ndgObject,ndgRetrieve
-from ows_server.controllers.retrieve import RetrieveController
-
 class CsmlWcsController(OwsController):
     _ows_parameters = {
@@ -39 +35 @@
         'ExceptionFormat': make_domain(['text/xml']),
         }
-
-    def _get_csml_document(self,fileoruri):
-        """
-        Gets a csml document from file or exist when passed a file name or uri - this should make 'get_csml_doc' obselete
-        """
-        if string.find(fileoruri,'__NDG-A0__') == -1:
-            #it's a local file not an identifier
-            file=fileoruri
-            csml_dir = request.environ['paste.config']['app_conf']['csml_dir']
-            path = os.path.join(csml_dir, file)
-            if os.path.exists(path+'.csml'):
-                f = path+'.csml'
-            elif os.path.exists(path+'.xml'):
-                f = path +'.xml'
-            else:
-                raise ValueError("Cannot find CSML file %s" % file)
-            
-            d = csml.parser.Dataset()
-            d.parse(f)
-        
-        else:
-            #it's an NDG identifier, get the document from exist.
-            uri=fileoruri
-            uri='badc.nerc.ac.uk__NDG-A0__ReMryRVA'        
-            uriN=ndgObject.ndgObject(uri)
-            self.cf=request.environ['ndgConfig']
-            self.requestor=request.environ['REMOTE_ADDR']
-            print 'session',session
-            if 'ndgSec' in session:
-                securityTokens=session['ndgSec']
-            else: securityTokens=None
-            print securityTokens
-            status,x=ndgRetrieve.ndgRetrieve(
-                    uriN,self.cf,requestor=self.requestor,
-                    securityTokens=securityTokens)
-            print 'output from retrieve controller: ',x        
-            print type(x)
-            #TODO, need to parse this output into a csml Dataset object, d
-            
-        return d
 
 
@@ -172 +128 @@
         """
         # Populate the context object with information required by the template
-        c.dataset = self._get_csml_document(fileoruri)
+        #c.dataset = get_csml_document(fileoruri)
         
         #get doc from cache or disk:
-        #c.dataset = csmlCache[fileoruri]
+        c.dataset = csmlCache[fileoruri]
         return self._renderCapabilities('ows/wcs_capabilities')
 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py

@@ -13 +13 @@
 from ows_common.get_capabilities import ServiceMetadata
 import ows_common.xml
+import string
+
 
 try:

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/csml_util.py

@@ -10 +10 @@
 from pylons import Response, c, g, cache, request, session
 import csml, cdms
-import os
+import os, string
 import zipfile
 import tempfile
+from ows_server.models import ndgObject,ndgRetrieve
 
+def get_csml_doc(fileoruri):
+        """
+        Gets a csml document from file or exist when passed a file name or uri         
+               
+        Note, access control is not implemented on file access, only on exist access.
+        
+        """
+        if string.find(fileoruri,'__NDG-A0__') == -1:
+            #it's a local file not an identifier
+            file=fileoruri
+            csml_dir = request.environ['paste.config']['app_conf']['csml_dir']
+            path = os.path.join(csml_dir, file)
+            if os.path.exists(path+'.csml'):
+                f = path+'.csml'
+            elif os.path.exists(path+'.xml'):
+                f = path +'.xml'
+            else:
+                raise ValueError("Cannot find CSML file %s" % file)
+            
+            d = csml.parser.Dataset()
+            d.parse(f)
+        
+        else:
+            #it's an NDG identifier, get the document from exist.
+            uri=fileoruri
+            uri='badc.nerc.ac.uk__NDG-A0__ReMryRVA'        
+            uriN=ndgObject.ndgObject(uri)
+            cf=request.environ['ndgConfig']
+            requestor=request.environ['REMOTE_ADDR']
+            if 'ndgSec' in session:
+                securityTokens=session['ndgSec']
+            else: securityTokens=None
+            status,x=ndgRetrieve.ndgRetrieve(
+                    uriN,cf,requestor=requestor,
+                    securityTokens=securityTokens)
+            d=csml.parser.Dataset()
+            d.parseElemTree(x.tree)                         
+        return d
 
+#this version of get_csml_doc can be deleted now if no problems found with new version:
+#def get_csml_doc(file):
+    #"""
+    #A trivial document retrieval function.
 
-def get_csml_doc(file):
-    """
-    A trivial document retrieval function.
+    #This could be replaced with a proper csml server object that supports
+    #multiple stores (filesystem, exist) and cache's the results for
+    #performance.
 
-    This could be replaced with a proper csml server object that supports
-    multiple stores (filesystem, exist) and cache's the results for
-    performance.
-
-    """
-    csml_dir = request.environ['paste.config']['app_conf']['csml_dir']
-    path = os.path.join(csml_dir, file)
-    if os.path.exists(path+'.csml'):
-        f = path+'.csml'
-    elif os.path.exists(path+'.xml'):
-        f = path +'.xml'
-    else:
-        raise ValueError("Cannot find CSML file %s" % file)
+    #"""
+    #csml_dir = request.environ['paste.config']['app_conf']['csml_dir']
+    #path = os.path.join(csml_dir, file)
+    #if os.path.exists(path+'.csml'):
+        #f = path+'.csml'
+    #elif os.path.exists(path+'.xml'):
+        #f = path +'.xml'
+    #else:
+        #raise ValueError("Cannot find CSML file %s" % file)
     
-    d = csml.parser.Dataset()
-    d.parse(f)
+    #d = csml.parser.Dataset()
+    #d.parse(f)
       
-    return d
+    #return d