Changeset 2711 for TI05-delivery/ows_framework

Timestamp:

06/07/07 15:58:06 (12 years ago)

Author:

domlowe

Message:

describeCoverage operation added. Added name parameter to Operations class

Location:

TI05-delivery/ows_framework/trunk

Files:

• ows_common/ows_common/operations_metadata.py (modified) (1 diff)
• ows_server/ows_server/controllers/csml_wcs.py (modified) (3 diffs)
• ows_server/ows_server/lib/base.py (modified) (1 diff)
• ows_server/ows_server/templates/ows/wcs_capabilities.kid (modified) (1 diff)
• ows_server/ows_server/templates/ows/wms_capabilities.kid (modified) (2 diffs)
• ows_server/ows_server/templates/wcs_DescribeCoverageResponse.kid (added)

TI05-delivery/ows_framework/trunk/ows_common/ows_common/operations_metadata.py

@@ -58 +58 @@
     @ivar parameters
     @type parameters: dictionary of Domain objects
-
+    @ivar name
+    @type name: None or str
     """
-    def __init__(self, get=None, post=None, constraints={}, parameters={}):
+    def __init__(self, get=None, post=None, constraints={}, parameters={}, name=None):
         self.get = get
         self.post = post
         self.constraints = constraints
         self.parameters = parameters
+        self.name=name
 
 class RequestMethod(OnlineResource):

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

@@ -9 +9 @@
 """
 
-#NOTE, much of this is straight from WMS and needs to be overhauled.
 
 try: #python 2.5
@@ -120 +119 @@
         ds = WcsDatasetSummary(titles=['Root Dataset'], datasetSummaries=[], CRSs=['CRS:84'])
         # Add a DatasetSummary for each feature        
+
         for f_n in c.dataset.getFeatureList():        
             feature_ds = self._loadFeatureSummary(c.dataset.getFeature(f_n))
@@ -140 +140 @@
         
         #get doc from cache or disk:
-        c.dataset = interface.GetParsedCSML(fileoruri)
+        rstatus,c.dataset=interface.GetParsedCSML(fileoruri)
+        if not rstatus: raise ValueError(c.dataset)        
+      
+        
         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')
-
+    
+    @operation
+    @parameter('Service', possibleValues=['WCS'], required=True)
+    @parameter('Version', possibleValues=['1.1.0'])
+    @parameter('Identifier', required=True)
+    @parameter('Format', possibleValues=['text/xml'], required=True)  #IS THIS MANDATORY
+    def DescribeCoverage(self, fileoruri, version, service, identifier):
+        """
+        WCS DescribeCoverage operation
+        """
+        rstatus,c.dataset=interface.GetParsedCSML(fileoruri)
+        if not rstatus: raise ValueError(dataset)
+            
+        #TODO, handle multiple identifiers
+        feature = dataset.getFeature(identifier)
+        if feature is None:
+            raise OWS_E.InvalidParameterValue('Coverage not found', 'identifier')
+        
+        r=render_response('wcs_DescribeCoverageResponse', format='xml')
+        r.headers['content-type'] = 'text/xml'
+        return r    
+    
     
     @operation

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

@@ -95 +95 @@
                                              post=None,
                                              parameters=p,
-                                             constraints=c)
+                                             constraints=c,
+                                             name=op._ows_name)
         
         sm.operationsMetadata = OperationsMetadata(od, constraints, parameters)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ows/wcs_capabilities.kid

@@ -30 +30 @@
 
   <!--! Named template definitions -->
-  <Operation py:def="opXML(op)">
+  <Operation py:def="opXML(op)" name="${op.name}" >
     <?python formats = op.parameters.get('Format') ?>
     <Format py:if="formats is not None"

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ows/wms_capabilities.kid

@@ -36 +36 @@
 
   <!--! Named template definitions -->
-  <Operation py:def="opXML(op)">
+  <Operation py:def="opXML(op)" >
     <?python formats = op.parameters.get('Format') ?>
     <Format py:if="formats is not None"
@@ -134 +134 @@
     <!--! These fields are represented in ows_common as service constraints -->
     <?python om = sm.operationsMetadata ?>
-    <LayerLimit py:if="'LayerLimit' in om.constraints"
-                py:content="om.constraints['LayerLimit'].possibleValues.allowedValues[0]"/>
-    <MaxWidth py:if="'MaximumWidth' in om.constraints"
-              py:content="om.constraints['MaximumWidth'].possibleValues.allowedValues[0]"/>
-    <MinWidth py:if="'MinimumWidth' in om.constraints"
-              py:content="om.constraints['MinimumWidth'].possibleValues.allowedValues[0]"/>
+
     
     <Capability>