Changeset 2689

Timestamp:

03/07/07 12:14:23 (12 years ago)

Author:

domlowe

Message:

general commit -including 3d bbox validator

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

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

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

@@ -131 +131 @@
         #get doc from cache or disk:
         c.dataset = csmlCache[fileoruri]
+        if type(c.dataset) is str:
+            #If not a csml datset is some message from exist such as 'access denied'           
+            return Response(c.dataset)
         return self._renderCapabilities('ows/wcs_capabilities')
 
@@ -137 +140 @@
     @parameter('Version', possibleValues=['1.1.0'], required=True)
     @parameter('Identifier', required=True)
-    @parameter('BoundingBox', required=True, validator=V.bbox_2d)
+    @parameter('BoundingBox', required=True, validator=V.bbox_2or3d)
     @parameter('TimeSequence',required=True, validator=V.iso8601_time)
     @parameter('Format', possibleValues=['application/netcdf'], required=True)
     @parameter('Store', validator = V.boolean('Store'))
     @parameter('Status', validator = V.boolean('Status'))
-    #TODO some more parameter to add here
+    #TODO some more parameters to add here
     # Dimension parameters Time, Elevation, etc. are handled separately
-    def GetCoverage(self, file, version, format, identifier, boundingbox, timesequence, store=False, status=False):
+    def GetCoverage(self, fileoruri, version, format, identifier, boundingbox, timesequence, store=False, status=False):
         try:
                     # Retrieve dataset and selected feature
             
-            dataset = get_csml_doc(file)
+            dataset = csmlCache[fileoruri]
             feature = dataset.getFeature(identifier)
             if feature is None:
                 raise OWS_E.InvalidParameterValue('Coverage not found', 'identifier')
-    
+            
+                        
             #set bounding box TODO
             sel = dict(latitude=(boundingbox[1], boundingbox[3]), longitude=(boundingbox[0], boundingbox[2]))           
@@ -159 +163 @@
             # Extract via CSML.subsetToGridSeries()
             if store:
-                filename = extractToNetCDF(feature, sel, publish=True)
+                #need to farm off to WPS
+                #but for now...
+                filename = extractToNetCDF(feature, sel, publish = True) 
             else:
                 filename = extractToNetCDF(feature, sel)
-            
-            #use the randomly allocated filename as a basis for an identifier
+                
+            #use the randomly allocated filename as a basis for an identifier           
             f=os.path.basename(filename)
             c.fileID=os.path.splitext(f)[0]

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

@@ -50 +50 @@
                     securityTokens=securityTokens)
             d=csml.parser.Dataset()
-            d.parseElemTree(x.tree)                         
+            if type(x) is str:
+                #then its an access denied message or similar:
+                return x
+            d.parseElemTree(x.tree)                   
         return d
 
@@ -83 +86 @@
        publish flag is used to indicate that the netcdf file should be made available to the webserver (for asynchronous delivery)
     """
+    
 
     if publish:
@@ -90 +94 @@
     else:
         extract_dir = request.environ['paste.config']['app_conf']['tmp_dir']
+      
     
     # Subset the feature

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

@@ -39 +39 @@
 
     return bbox_t
+
+def bbox_2or3d(bbox):
+    """
+    Checks it's a 2D or 3D BBOX and parse it into a tuple of floats.
+
+    """
+
+    try:
+        bbox_t = [float(x) for x in bbox.split(',')]
+    except ValueError:
+        raise InvalidParameterValue("Incorrect BBOX specification %s" % bbox, 'bbox')
+
+    if len(bbox_t) not in [4,6]:
+        raise InvalidParameterValue("Incorrect BBOX specification %s" % bbox, 'bbox')
+
+    return bbox_t
+