Changeset 2501 for TI05-delivery

Timestamp:

22/05/07 13:05:26 (14 years ago)

Author:

spascoe

Message:

Many new ideas in this commit. It's still in a state of flux.
I'm exploring using decorators and class attributes with the prefix "_ows"
to declare properties that need to be in the OWS capabilities document.

Location:

TI05-delivery/ows_framework/trunk

Files:

• ows_common/ows_common/decorators.py (added)
• ows_common/ows_common/domain.py (modified) (3 diffs)
• ows_common/ows_common/exceptions.py (added)
• ows_common/ows_common/iso19115_subset.py (moved) (moved from TI05-delivery/ows_framework/trunk/ows_common/ows_common/is19115_subset.py) (3 diffs)
• ows_server/development.ini (modified) (1 diff)
• ows_server/ows_server/controllers/csml_api.py (modified) (1 diff)
• ows_server/ows_server/controllers/csml_wms.py (added)
• ows_server/ows_server/lib/csml.py (added)
• ows_server/ows_server/templates/wms_get_capabilities.kid (added)
• ows_server/ows_server/templates/wms_service_metadata.kid (modified) (2 diffs)
• ows_server/ows_server/tests/functional/test_csml_wms.py (added)

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

@@ -30 +30 @@
 
     """
-    def __init__(self, possibleValues, defaultValue=None, metadata=[],
-                 meaning=None, dataType=None, valuesUnit):
+    def __init__(self,  defaultValue=None, possibleValues=None, metadata=[],
+                 meaning=None, dataType=None, valuesUnit=None):
+        if possibleValues is None:
+            possibleValues = PossibleValues.anyValue()
         self.possibleValues = possibleValues
         self.defaultValue = defaultValue
@@ -81 +83 @@
         k.type = klass.ALLOWED_VALUES
         k.allowedValues = valueOrRanges
+        return k
 
     @classmethod
@@ -126 +129 @@
 
     """
-    __slots__ = ['reference']
 
     def __init__(self, name, reference=None):

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

@@ -18 +18 @@
 
     """
-    __slots__ = ['lang']
     
     def __init__(self, value, lang=None):
@@ -35 +34 @@
 
     """
-    __slots__ = ['codeSpace']
 
     def __init__(self, code, codeSpace=None):
@@ -73 +71 @@
 
     """
-    def __init__(self, href, role=None, show=None, title=None, actuate=None
+    def __init__(self, href, role=None, show=None, title=None, actuate=None,
                  arcrole=None):
         self.href = href

TI05-delivery/ows_framework/trunk/ows_server/development.ini

@@ -21 +21 @@
 session_secret = somesecret
 csml_dir = /research/home/spascoe/host/saturn/data/ddc_data/obs
+ows_common_config = %(here)s/eg_ows_capabilities.xml
 
 # If you'd like to fine-tune the individual locations of the cache data dirs

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

@@ +1 @@
+# Copyright (C) 2007 STFC & NERC (Science and Technology Facilities Council).
+# This software may be distributed under the terms of the
+# Q Public License, version 1.0 or later.
+# http://ndg.nerc.ac.uk/public_docs/QPublic_license.txt
+"""
+Basic CSML controller.
+
+@author: Stephen Pascoe
+"""
+
 from ows_server.lib.base import *
 import csml.parser
 import os
+from ows_server.lib.csml import get_csml_doc
 
-def get_csml_doc(file):
-    """
-    A trivial document retrieval function.
-
-    This could be replaced with a proper csml server object that supports
-    multiple stores (filesystem, exist) and cache's the results for
-    performance.
-
-    """
-    csml_dir = request.environ['paste.config']['app_conf']['csml_dir']
-    path = os.path.join(csml_dir, file)
-    if os.path.exists(path+'.csml'):
-        f = path+'.csml'
-    elif os.path.exists(path+'.xml'):
-        f = path +'.xml'
-    else:
-        raise ValueError("Cannot find CSML file %s" % file)
-    
-    d = csml.parser.Dataset()
-    d.parse(f)
-        
-    return d
 
 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/wms_service_metadata.kid

@@ -4 +4 @@
 WMS 1.3.0 compliant wms:Service XML.
 
-@param ows_c: A ows:Capabilities XML tree node containing
+@var c.ows_c: A ows:Capabilities XML tree node containing
     ServiceIdentification and ServiceProvider children.
 """
@@ -10 +10 @@
 from ows_server.lib.wms_capabilities import WmsOwsAdapter
 ?>
-<WMS_Capabilities version="1.3.0"
+<WMS_Capabilities xmlns:py="http://purl.org/kid/ns#"
+                  version="1.3.0"
                   xmlns="http://www.opengis.net/wms"
-                  xmlns:py="http://purl.org/kid/ns#"
                   xmlns:xlink="http://www.w3.org/1999/xlink"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_2_0.xsd">
+  <Service py:def="wms_service">
+    <?python m = WmsOwsAdapter(c.ows_c) ?>
 
-<?python m = WmsOwsAdapter(ows_c) ?>
-
-  <Service>
     <Name>WMS</Name>
     <Title py:if="m.title" py:content="m.title"/>