Changeset 2964 for TI05-delivery/ows_framework/trunk

Timestamp:

22/10/07 14:49:38 (12 years ago)

Author:

domlowe

Message:

more corrections to pass cite tests

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers

Files:

• csml_wcs1_0_0.py (modified) (4 diffs)
• csml_wcs1_1_0.py (modified) (1 diff)
• csml_wcsx.py (modified) (4 diffs)

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

@@ -171 +171 @@
     @parameter('Format', possibleValues=['text/xml'])
     @parameter('Service', possibleValues=['WCS'], required=True)
-    @parameter('Version', possibleValues=['1.0.0'])
+    @parameter('Version', possibleValues=['','1.0.0'])
     @parameter('Section', possibleValues=['/','/Service', '/Capability', '/ContentMetadata'])
-    def GetCapabilities(self, uri, service=None, version=None, section=None):
+    def GetCapabilities(self, uri, service=None, version='1.0.0', section=None):
         """
         @note: format and updatesequence parameters are not supported
@@ -208 +208 @@
     @operation
     @parameter('Service', possibleValues=['WCS'], required=True)
-    @parameter('Version', possibleValues=['1.0.0'])
+    @parameter('Version', possibleValues=['','1.0.0'])
     @parameter('Coverage', required=True)
     @parameter('Format', possibleValues=['text/xml'])  #IS THIS MANDATORY
@@ -242 +242 @@
 
     @operation
-    @parameter('Version', possibleValues=['1.0.0'], required=True)
+    @parameter('Version', possibleValues=['','1.0.0'], required=True)
     @parameter('Coverage', required=True)
-    @parameter('CRS', required=True)
+    @parameter('CRS')
     @parameter('Response_CRS')
     @parameter('BBox', required=True, validator=V.bbox_2or3d)
-    @parameter('Time',required=True, validator=V.iso8601_time)
-    @parameter('Format', possibleValues=['application/netcdf'], required=True)
+    @parameter('Time', validator=V.iso8601_time)
+    @parameter('Format', possibleValues=['cf-netcdf'], required=True)
     @parameter('Store', validator = V.boolean('Store'))
     @parameter('Status', validator = V.boolean('Status'))
     #TODO some more parameters to add here
     # Dimension parameters Time, Elevation, etc. are handled separately
-    def GetCoverage(self, uri, version, format, coverage, bbox, time, exceptions='application/vnd.ogc.se_xml',store=False, status=False):
+    def GetCoverage(self, uri, version, format, coverage, bbox, time =None, crs=None, response_crs=None, exceptions='application/vnd.ogc.se_xml',store=False, status=False):
         # Retrieve dataset and selected feature         
         identifier=coverage
@@ -282 +282 @@
             sel[lat]=(boundingbox[1], boundingbox[3])
             sel[lon]=(boundingbox[0], boundingbox[2])
-            if  type(time) is unicode:
-                sel[t]=str(time)
-            else:
-                sel[t]=time
+            if time is not None:
+                if  type(time) is unicode:
+                    sel[t]=str(time)
+                else:
+                    sel[t]=time
             
             #z is the 4th axis (eg height or pressure).

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

@@ -174 +174 @@
     @parameter('Service', possibleValues=['WCS'], required=True)
     @parameter('Version', possibleValues=['1.1.0'])
-    def GetCapabilities(self, uri, service=None, version=None):
+    def GetCapabilities(self, uri, service=None, version='1.1.0'):
         """
         @note: format and updatesequence parameters are not supported

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

@@ -19 +19 @@
         ''' return the wcs controller that corresponds to the version requested
         called from within the other methods, which have already performed validation on the version parameter '''
+        if self.version not in ['1.0.0', '1.1.0']: 
+            self.version='1.0.0' #default is 1.0.0
         
         if self.version == '1.0.0':
@@ -29 +31 @@
         
     @operation
-    @parameter('Version', possibleValues=['1.0.0','1.1.0'])
+    @parameter('Version', possibleValues=['','1.0.0','1.1.0'])
     def GetCapabilities(self, version=None):
         """
@@ -38 +40 @@
             
     @operation
-    @parameter('Version', possibleValues=['1.0.0','1.1.0'])
+    @parameter('Version', possibleValues=['','1.0.0','1.1.0'])
     def DescribeCoverage(self, version=None):
         """
@@ -47 +49 @@
         
     @operation
-    @parameter('Version', possibleValues=['1.0.0','1.1.0'])
+    @parameter('Version', possibleValues=['','1.0.0','1.1.0'])
     def GetCoverage(self, version=None):
         """