Changeset 3487 for TI05-delivery/ows_framework

Timestamp:

21/02/08 12:20:58 (13 years ago)

Author:

spascoe

Message:

 

Location:

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common

Files:

• helpers.py (added)
• pylons/ows_controller.py (modified) (4 diffs)
• pylons/templates/wms_capabilities_1_1_1.xml (modified) (1 diff)

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/ows_controller.py

@@ -18 +18 @@
 from ows_common import helpers
 from ows_common.operations_metadata import *
+from ows_common.contents import Contents
 
 from genshi.template import TemplateLoader
@@ -110 +111 @@
                                                   param)
 
+#-----------------------------------------------------------------------------
+# Functions that populate c.capabilities
+
+def addOperation(opName, formats=[]):
+    ops = c.capabilities.operationsMetadata.operationDict
+    ops[opName] = helpers.operation(url_for(), formats=formats)
+
+def addLayer(name, title, abstract, srs, bbox):
+    if c.capabilities.contents is None:
+        c.capabilities.contents = Contents()
+
+    layer = helpers.wms_layer(url_for(), name, title, srs, bbox, abstract)
+    c.capabilities.contents.datasetSummaries.append(layer)
+
+def initCapabilities():
+    """
+    Initialise the capabilities object c.capabilities.
+
+    By default the server-wide configuration file is loaded and
+    used to populate some standard metadata.  The GetCapabilites
+    operation is added.
+
+    """
+    # Load the basic ServiceMetadata from a config file
+    configFile = config.get('ows_server.capabilities_config')
+    c.capabilities = loadConfigFile(configFile)
+
+    om = OperationsMetadata(operationDict={})
+    c.capabilities.operationsMetadata = om
+
+    addOperation('GetCapabilities', formats=['text/xml'])
+
+#-----------------------------------------------------------------------------
 
 class OwsController(OwsControllerBase):
@@ -150 +184 @@
 
         # Get information required for the capabilities document
-        self._initCapabilities()
+        initCapabilities()
         self._loadCapabilities()
         
@@ -157 +191 @@
         return self._renderCapabilities(version, format)
 
-    def _initCapabilities(self):
-        """
-        Initialise the capabilities object c.capabilities.
-
-        By default the server-wide configuration file is loaded and
-        used to populate some standard metadata.  The GetCapabilites
-        operation is added.
-
-        """
-        # Load the basic ServiceMetadata from a config file
-        configFile = config.get('ows_server.capabilities_config')
-        c.capabilities = loadConfigFile(configFile)
-
-        getCap = helpers.operation(url_for(), formats=['text/xml'])
-        om = OperationsMetadata(operationDict=dict(GetCapabilities=getCap))
-        c.capabilities.operationsMetadata = om
 
     def _loadCapabilities(self):

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/templates/wms_capabilities_1_1_1.xml

@@ -123 +123 @@
     </py:if>
     
-    <Layer py:if="sm.contents is not None"
-           py:replace="layer(sm.contents.datasetSummaries[0])"/>
+    <Layer py:if="sm.contents is not None">
+      <Title>Contents</Title>
+      <Layer py:for="ds in sm.contents.datasetSummaries"
+             py:replace="markupLayer(ds)"/>
+    </Layer>
   </Capability>
 </WMT_MS_Capabilities>