Changeset 4467

Timestamp:

20/11/08 15:35:54 (12 years ago)

Author:

cbyrom

Message:

Strip out code not relevant to MILK - mainly WCS and WMS stuff - also including the CSML server code + trackback code
Also tidy up structure of 'public' dir - setting up new 'style' dir and
centralising icons in icons dir + remove all unused icons, javascript and stylesheets.
Also strip out testcase code and populate new test directory structure.

Location:

MILK/trunk/milk_server/milk_server

Files:

• __init__.py (modified) (1 diff)
• config/environment.py (modified) (2 diffs)
• config/middleware.py (modified) (2 diffs)
• config/ndgMiddleware.py (modified) (3 diffs)
• config/routing.py (copied) (copied from MILK/trunk/milk_server/milk_server/config/routing.py) (2 diffs)
• websetup.py (modified) (1 diff)

MILK/trunk/milk_server/milk_server/__init__.py

@@ -1 +1 @@
 """
-ows_server
+milk_server
 
-This file loads the finished app from ows_server.config.middleware.
+This file loads the finished app from milk_server.config.middleware.
 
 """
 
-from ows_server.config.middleware import make_app
+from milk_server.config.middleware import make_app

MILK/trunk/milk_server/milk_server/config/environment.py

@@ -5 +5 @@
 from pylons import config
 
-import ows_server.lib.app_globals as app_globals
-import ows_server.lib.helpers
-from ows_server.config.routing import make_map
+import milk_server.lib.app_globals as app_globals
+import milk_server.lib.helpers
+from milk_server.config.routing import make_map
 
 # Set-up tools package import for locating NDG Security SSO Service
@@ -28 +28 @@
     
     # Initialize config with the basic options
-    config.init_app(global_conf, app_conf, package='ows_server',
+    config.init_app(global_conf, app_conf, package='milk_server',
                     template_engine='kid', paths=paths)
-    config.add_template_engine("genshi", "ows_server.templates", {})
+    config.add_template_engine("genshi", "milk_server.templates", {})
     
     config['pylons.g'] = app_globals.Globals()
-    config['pylons.h'] = ows_server.lib.helpers
+    config['pylons.h'] = milk_server.lib.helpers
     config['routes.map'] = make_map()
     

MILK/trunk/milk_server/milk_server/config/middleware.py

@@ -11 +11 @@
 from pylons.wsgiapp import PylonsApp
 
-from ows_server.config.environment import load_environment
+from milk_server.config.environment import load_environment
 
-from ows_server.config.ndgMiddleware import ndgMiddleware
+from milk_server.config.ndgMiddleware import ndgMiddleware
 
 # Logging doesn't need configuring if you have paste.translogger in your config file.
@@ -43 +43 @@
     # Put your own middleware here, so that any problems are caught by the error
     # handling middleware underneath
-
     app = ndgMiddleware(app, g, app_conf)
     g=app.globals   
     
-    # Configure logging
+    # Configure logging - NB logging config set in the development.ini file
     #logging.basicConfig(format='%(thread)s %(name)s %(levelname)s %(message)s')
     

MILK/trunk/milk_server/milk_server/config/ndgMiddleware.py

@@ -1 +1 @@
 # ndg middleware
 from paste.deploy import CONFIG
-from ows_server.models.Utilities import myConfig
+from milk_server.lib.Utilities import myConfig
 
 
@@ -15 +15 @@
         
         #set up the ndg configuration file
-        
-        #Changed by Dom: CONFIG.get wasn't respecting the %(home)s variable, so moved to app_conf section in ini file.
-        #cf=CONFIG.get('configfile')
         cf= CONFIG['app_conf']['configfile']
         cf=myConfig(cf)
@@ -24 +21 @@
         self.globals.htdocs=cf.get('DEFAULT','htdocs',None)
         self.globals.localLink=cf.get('layout','localLink',None)
-        self.globals.localImage=cf.get('layout','localImage',None)
         self.globals.localAlt=cf.get('layout','localAlt','Visit Local Site')
         self.globals.ndgLink=cf.get('layout','ndgLink','http://ndg.nerc.ac.uk')

MILK/trunk/milk_server/milk_server/config/routing.py

@@ -18 +18 @@
     # so they may take precedent over the more generic routes. For more information, refer
     # to the routes manual @ http://routes.groovie.org/docs/
-    #map.connect(':controller/:action/:id')
-    #map.connect('*url', controller='template', action='view')
     
-    #WMS
-    map.connect(':file/wms', controller='csml_wms')  #should become obsolete
-    map.connect('wms/:uri', controller='csml_wms')
-    
-    #WCS
-    #map.connect(':file/status/:jobID', controller='status', action='getStatus')  #not used currently
-    #wcs controller for all versions: (called wcsx)
-    map.connect('wcs/:uri', controller='csml_wcsx')
-
-    #filestore - used for 'store' in wcs
-    map.connect('filestore/:file', controller='fetch', action='fetchFile')
-    
-    # following is the shell for the rest of the ndg 
-    map.connect('upload/:uri', controller = 'editatom', action='upload', uri = None)
-    map.connect('editAtom/:uri', controller = 'editatom', action='edit')
-    map.connect('saveAtom/:uri/:saveLevel', controller = 'editatom', \
+    # atom editor specific routing
+    map.connect('upload/:uri', controller = 'atom_editor/editatom', action='upload', uri = None)
+    map.connect('editAtom/:uri', controller = 'atom_editor/editatom', action='edit')
+    map.connect('saveAtom/:uri/:saveLevel', controller = 'atom_editor/editatom', \
                 action='saveAtom', saveLevel='0')
-    map.connect('createAtom/:saveData', controller = 'editatom', action='create', \
+    map.connect('createAtom/:saveData', controller = 'atom_editor/editatom', action='create', \
                 saveData = None)
-    map.connect('createGranule', controller = 'editatom', action='createGranule')
-    map.connect('atomHome', controller = 'listatom', action='atomHome')
+    map.connect('createGranule', controller = 'atom_editor/editatom', action='createGranule')
+    map.connect('atomHome', controller = 'atom_editor/listatom', action='atomHome')
     map.connect('listAtom/:searchData/:associatedAtomID/:associatedAtomType/:associationType', \
-                controller = 'listatom', action='list', searchData='', \
+                controller = 'atom_editor/listatom', action='list', searchData='', \
                 associatedAtomID='', associatedAtomType='', associationType='')
     map.connect('viewDeployments/:uri', controller = 'retrieve', action='viewDeployments')
 
-    
+    # routing for the browse/discovery server
     map.connect('login', controller='login')
     map.connect('getCredentials', controller='login', action='getCredentials')
@@ -64 +50 @@
     map.connect('unSelectItem/:entryid/:divid', controller='selectedItems',action='unSelectItem')
     map.connect('removeSelectedItem/:entryid',controller='selectedItems',action='removeSelectedItem')
-    map.connect('visualise', controller='visualise', action='index')
 
-    # This route doesn't match the controller's parameters.
-    #map.connect('csml/:uri', controller='csml_api')
-    # Below is the way it worked before with added
-    #"csml" path component
-    #map.connect('csml/:file.:format', controller='csml_api', action='index',
-              #format='html')
-    #map.connect('csml/:file/:(feature).:format', action='getFeature',
-              #controller='csml_api', format='html')
-    #map.connect('csml/:file/:feature/:action', controller='csml_api')
-
-    map.connect('trackback/:uri', controller='trackback')
     map.connect('discovery',controller='discovery')
-    map.connect('visualise/:dataset/:view',controller='visualise',action='tabChange')
-    map.connect('visualise/:view',controller='visualise',action='featureChange')
     #do this last or else you'll get bizarre behaviour
     map.connect('',controller='discovery',action='index')

MILK/trunk/milk_server/milk_server/websetup.py

@@ -3 +3 @@
 def setup_config(command, filename, section, vars):
     """
-    Place any commands to setup ows_server here.
+    Place any commands to setup milk_server here.
     """
     conf = paste.deploy.appconfig('config:' + filename)