Changeset 2681

Timestamp:

02/07/07 11:18:45 (14 years ago)

Author:

domlowe

Message:

unicode problem in ndgObject wrapped with str

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• config/routing.py (modified) (1 diff)
• controllers/csml_wcs.py (modified) (1 diff)
• lib/csml_util.py (modified) (2 diffs)
• models/ndgObject.py (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/routing.py

@@ -27 +27 @@
     # change these when security layer is present and not before
     #to
-    # map.connect('wms/:uri',controller='csml_wms')
-    # map.connect('wcs/:uri',controller='csml_wcs')
+    #map.connect('wms/:uri',controller='csml_wms')
+    #map.connect('wcs/:uri',controller='csml_wcs')
     
     map.connect(':file/wms', controller='csml_wms')
     map.connect('wcs/:fileoruri', controller='csml_wcs')
-    map.connect(':file/wcs', controller='csml_wcs')
+    map.connect(':fileoruri/wcs', controller='csml_wcs')
     map.connect(':file/status/:jobID', controller='status', action='getStatus')
     

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

@@ -128 +128 @@
         """
         # Populate the context object with information required by the template
-        #c.dataset = get_csml_document(fileoruri)
         
         #get doc from cache or disk:

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

@@ -40 +40 @@
             #it's an NDG identifier, get the document from exist.
             uri=fileoruri
-            uri='badc.nerc.ac.uk__NDG-A0__ReMryRVA'        
+            print type(uri)
+            #uri='badc.nerc.ac.uk__NDG-A0__ReMryRVA'
+            uri=str(uri)
             uriN=ndgObject.ndgObject(uri)
             cf=request.environ['ndgConfig']
@@ -51 +53 @@
                     securityTokens=securityTokens)
             d=csml.parser.Dataset()
+            #print x
             d.parseElemTree(x.tree)                         
         return d

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/ndgObject.py

@@ -13 +13 @@
         Real services should also be available, and at some point of course the services should be looked up 
         at a service registry, but that's not yet available. '''
-        
+        uri=str(uri) #Dom had problem with unicode coming in here ... dunno why @@@@
         self.gettable=-1  # The specific record is not known to be gettable via any service
                           # other values of gettable allowed are