Changeset 3367 for DPPP/ukcip02_server

Timestamp:

11/02/08 14:00:45 (13 years ago)

Author:

spascoe

Message:

Work in progress ...

Location:

DPPP/ukcip02_server/trunk/ukcip_server

Files:

• development.ini (modified) (1 diff)
• ukcip_server/config/environment.py (modified) (1 diff)
• ukcip_server/config/ukcip02.py (modified) (2 diffs)
• ukcip_server/controllers/ukcip_wms.py (modified) (1 diff)
• ukcip_server/model/pywms/wms_cdms.py (modified) (1 diff)

DPPP/ukcip02_server/trunk/ukcip_server/development.ini

@@ -10 +10 @@
 smtp_server = localhost
 error_email_from = paste@localhost
+ukcip02.data_dir = /home/users/spascoe/host/saturn/data/ukcip02
 
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
-port = 5000
+port = 8080
 
 [app:main]

DPPP/ukcip02_server/trunk/ukcip_server/ukcip_server/config/environment.py

@@ -23 +23 @@
     # Initialize config with the basic options
     config.init_app(global_conf, app_conf, package='ukcip_server',
-                    template_engine='mako', paths=paths)
+                    template_engine='kid', paths=paths)
 
     config['routes.map'] = make_map()

DPPP/ukcip02_server/trunk/ukcip_server/ukcip_server/config/ukcip02.py

@@ -7 +7 @@
 from glob import glob
 
-from pylons import config, g
-from ukcip02.model.wms_cdms import SimpleCdmsLayer
+from pylons import config
+from ukcip_server.model.pywms.wms_cdms import SimpleCdmsLayer
 
 import cdms
@@ -22 +22 @@
             #!TODO: Min/Max values
             layers[varName] = SimpleCdmsLayer(ds[varName], 0, 100)
-        dataset[f] = ds
+        datasets[f] = ds
         
-    g.ukcip02_datasets = datasets
-    g.ukcip02_layers = layers
+    config['pylons.g'].ukcip02_datasets = datasets
+    config['pylons.g'].ukcip02_layers = layers

DPPP/ukcip02_server/trunk/ukcip_server/ukcip_server/controllers/ukcip_wms.py

@@ -1 +1 @@
 import logging
 
-from ows_common.pylons import OwsController
-from ows_common.decorators import ows_operation
+from ows_common.pylons.ows_controller import OwsController
+from ows_common.pylons.decorators import ows_operation
 from ows_common.exceptions import *
 

DPPP/ukcip02_server/trunk/ukcip_server/ukcip_server/model/pywms/wms_cdms.py

@@ -77 +77 @@
             self.maxValue = self.var.max_value
 
-        self.units = self.var.units
+        try:
+            self.units = self.var.units
+        except AttributeError:
+            self.units = '?'
 
     def selectGrid(self, bbox, dimensionSpec):