Changeset 2930 for TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs1_0_0.py

Timestamp:

05/10/07 14:45:54 (13 years ago)

Author:

domlowe

Message:

direct retrieval of data working, although request parameters not yet in line with 1.0.0

File:

• TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_wcs1_0_0.py (modified) (9 diffs)

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

@@ -34 +34 @@
 from ows_server.lib.ndgInterface import interface
 from ows_server.models.wcs_CoverageDescription import CoverageDescription
-
+import paste
 
 import logging
@@ -190 +190 @@
                 #If not a csml datset is some message from exist such as 'access denied'
                 return Response(c.dataset)
-            return self._renderCapabilities('wcs1_0_capabilities')
+            return self._renderCapabilities('wcs1_0_0_Capabilities')
         except Exception, e:
             if isinstance(e, OWS_E.OwsError):
@@ -220 +220 @@
                 self.features[ident]=feature
             c.covDescs=self._buildCoverageDescriptions()
-            r=render_response('wcs/wcs_DescribeCoverageResponse', format='xml')
+            r=render_response('wcs1_0_0_DescribeCoverageResponse', format='xml')
             r.headers['content-type'] = 'text/xml'
             return r
@@ -236 +236 @@
     @parameter('Identifier', required=True)
     @parameter('BoundingBox', required=True, validator=V.bbox_2or3d)
-    @parameter('TimeSequence',required=True, validator=V.iso8601_time)
+    @parameter('Time',required=True, validator=V.iso8601_time)
     @parameter('Format', possibleValues=['application/netcdf'], required=True)
     @parameter('Store', validator = V.boolean('Store'))
@@ -242 +242 @@
     #TODO some more parameters to add here
     # Dimension parameters Time, Elevation, etc. are handled separately
-    def GetCoverage(self, uri, version, format, identifier, boundingbox, timesequence, store=False, status=False):
+    def GetCoverage(self, uri, version, format, identifier, boundingbox, time, store=False, status=False):
         # Retrieve dataset and selected feature          
         try:
@@ -261 +261 @@
             t=feature.getTimeAxis()
             print '%s %s %s'%(lon,lat,t)
-            if None in [lon, lat, time]:
+            if None in [lon, lat, t]:
                 #TODO need to return a suitable wcs error.
                 print 'warning, could not get correct axis info'
@@ -269 +269 @@
             sel[lat]=(boundingbox[1], boundingbox[3])
             sel[lon]=(boundingbox[0], boundingbox[2])
-            if  type(timesequence) is unicode:
-                sel[t]=str(timesequence)
-            else:
-                sel[t]=timesequence
+            if  type(time) is unicode:
+                sel[t]=str(time)
+            else:
+                sel[t]=time
             
             #z is the 4th axis (eg height or pressure).
@@ -289 +289 @@
     
             # Extract via CSML.subsetToGridSeries()
-            
-            print 'SEL %s'%sel
             if store:
                 #need to farm off to WPS
@@ -335 +333 @@
                     return r                                 
             else:                
-                #STORE = FALSE, STATUS therefore irrelevant, return Multipart Mime.
-                netcdfFile=open(filename, 'r')
-                c.hyperlink="cid:coverage.nc"
-                xmlfile=render_response('wcs_getCoverageResponse', format='xml')
-                xmlfile.headers['content-type'] = 'text/xml'
-                multipart=self._createMultipartMime(xmlfile, netcdfFile)        
-                msg=multipart
-                try:
-                    #0.9.6
-                    pylons.response.headers['Content-Type']='multipart'
-                    return pylons.response(content=msg)
-                except:
-                    #0.9.5
-                    return Response(content=msg, mimetype='multipart')                     
+                #STORE = FALSE, STATUS therefore irrelevant, return file
+                fileToReturn=open(filename, 'r')
+                if os.path.splitext(filename)[1]=='.nc':
+                    mType='application/cf-netcdf'
+                else:
+                    mType='application/unknown'
+                 #Differnce in how Content-Types are handled between pylons 0.9.5 and 0.9.6
+            try:
+                #0.9.6
+                pylons.response.headers['Content-Type']=mType                
+                pylons.response.headers['Content-Disposition'] = paste.httpheaders.CONTENT_DISPOSITION(attachment=True, filename=f)
+                return pylons.response(content=fileToReturn)
+            except:
+                #0.9.5                
+                r=Response(content=fileToReturn, mimetype=mType)     
+                r.headers['Content-Disposition'] = paste.httpheaders.CONTENT_DISPOSITION(attachment=True, filename=f)                
+                return r
         except Exception, e:
             if isinstance(e, OWS_E.OwsError):