- Timestamp:
- 13/01/09 09:54:32 (12 years ago)
- Location:
- MILK/trunk/milk_server
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
MILK/trunk/milk_server/milk_server/config/milkMiddleware.py
r4724 r4798 3 3 ''' 4 4 from paste.deploy import CONFIG 5 from ndg Utils.models.myconfig import myConfig6 from ndg Utils.lib.atomvalidator import AtomValidator5 from ndg.common.src.models.myconfig import myConfig 6 from ndg.common.src.lib.atomvalidator import AtomValidator 7 7 import milk_server.lib.helpers as h 8 8 -
MILK/trunk/milk_server/milk_server/controllers/atom_editor/atomeditorcontroller.py
r4779 r4798 5 5 ''' 6 6 import logging, xmlrpclib, cgi, traceback 7 from ndg Utilsimport ndgObject8 from ndg Utils.models.Atom import Atom9 from ndg Utils.lib.utilities import escapeSpecialCharacters10 import ndg Utils.lib.existdbclient as edc7 from ndg.common.src.models.ndgObject import ndgObject 8 from ndg.common.src.models.Atom import Atom 9 from ndg.common.src.lib.utilities import escapeSpecialCharacters 10 import ndg.common.src.clients.xmldb.eXist.existdbclient as edc 11 11 from milk_server.lib.base import * 12 from milk_server.lib.ndgInterface import ndgInterface 13 from milk_server.lib import Utilities 12 14 from editorconstants import * 13 from milk_server.lib.ndgInterface import ndgInterface14 15 from formencode import htmlfill 15 from milk_server.lib import Utilities16 16 17 17 class AtomEditorController(BaseController): -
MILK/trunk/milk_server/milk_server/controllers/atom_editor/editatom.py
r4779 r4798 13 13 from milk_server.models.form import * 14 14 from milk_server.lib import mailer 15 import ndg Utils.lib.htmlUtilities as utils16 from ndg Utils.models.Atom import Atom, Person, Link, Category17 from ndg Utils.models import AtomState18 from ndg Utils.lib.atomvalidator import ValidationError19 import ndg Utils.lib.existdbclient as edc20 from ndg Utils.models.MolesEntity import MolesEntity as ME21 from ndg Utils.lib.utilities import escapeSpecialCharacters22 from ndg Utils.models.vocabtermdata import VocabTermData as VTD23 from ndg Utils.lib.granulite import granulite15 import ndg.common.src.lib.htmlUtilities as utils 16 from ndg.common.src.models.Atom import Atom, Person, Link, Category 17 from ndg.common.src.models import AtomState 18 from ndg.common.src.lib.atomvalidator import ValidationError 19 import ndg.common.src.clients.xmldb.eXist.existdbclient as edc 20 from ndg.common.src.models.MolesEntity import MolesEntity as ME 21 from ndg.common.src.lib.utilities import escapeSpecialCharacters 22 from ndg.common.src.models.vocabtermdata import VocabTermData as VTD 23 from ndg.common.src.lib.granulite import granulite 24 24 from editorconstants import * 25 25 from atomeditorcontroller import AtomEditorController -
MILK/trunk/milk_server/milk_server/controllers/atom_editor/listatom.py
r4779 r4798 6 6 ''' 7 7 import logging, xmlrpclib 8 from ndg Utils.models.Atom import Atom9 from ndg Utilsimport DocumentRetrieve10 from ndg Utils.eXistInterface import ndg_eXist11 from ndg Utils.models.vocabtermdata import VocabTermData as VTD, VocabTermItem as VTI8 from ndg.common.src.models.Atom import Atom 9 from ndg.common.src.dal.DocumentRetrieve import DocumentRetrieve 10 from ndg.common.src.clients.xmldb.eXist.eXistInterface import ndg_eXist 11 from ndg.common.src.models.vocabtermdata import VocabTermData as VTD, VocabTermItem as VTI 12 12 from milk_server.lib.base import * 13 13 from editorconstants import * 14 import ndg Utils.lib.htmlUtilities as utils14 import ndg.common.src.lib.htmlUtilities as utils 15 15 from atomeditorcontroller import AtomEditorController 16 16 -
MILK/trunk/milk_server/milk_server/controllers/browse/discovery.py
r4491 r4798 4 4 import socket, logging 5 5 from paste.request import parse_querystring 6 from ndg Utilsimport ndgSearch7 from ndg Utilsimport DocumentRetrieve8 from ndg Utils.DocumentRetrieve import ndgVocabPOX as VS9 from ndg Utilsimport ndgObject10 from ndg Utils.models.DIF import DIF6 from ndg.common.src.clients.ws.ndgSearch import ndgSearch 7 from ndg.common.src.dal import DocumentRetrieve 8 from ndg.common.src.dal.DocumentRetrieve import ndgVocabPOX as VS 9 from ndg.common.src.models.ndgObject import ndgObject 10 from ndg.common.src.models.DIF import DIF 11 11 from milk_server.lib.base import * 12 12 from milk_server.lib.Date import * -
MILK/trunk/milk_server/milk_server/controllers/browse/retrieve.py
r4779 r4798 1 1 2 import logging 3 from paste.request import parse_querystring 4 from xml.parsers.expat import ExpatError 2 5 from milk_server.lib.base import * 3 from ndgUtils import ndgObject 4 from paste.request import parse_querystring 5 from ndgUtils.models import stubB, DIF 6 from milk_server.lib import Utilities 6 7 from milk_server.lib import mailer 7 8 from milk_server.lib.ndgInterface import ndgInterface 8 from ndgUtils.models.DIF import DIF 9 from xml.parsers.expat import ExpatError 10 import logging 11 from ndgUtils.models.Atom import Atom 12 from ndgUtils.models.vocabtermdata import VocabTermData as VTD 13 from ndgUtils import DocumentRetrieve 14 from milk_server.lib import Utilities 9 from ndg.common.src.models import stubB, DIF, ndgObject 10 from ndg.common.src.models.ndgObject import ndgObject 11 from ndg.common.src.models.Atom import Atom 12 from ndg.common.src.models.vocabtermdata import VocabTermData as VTD 13 from ndg.common.src.dal import DocumentRetrieve 15 14 16 15 class RetrieveController(BaseController): -
MILK/trunk/milk_server/milk_server/lib/Utilities.py
r4779 r4798 1 1 import urllib, logging 2 2 from milk_server.lib.base import * 3 import ndg Utils.lib.existdbclient as edc3 import ndg.common.src.clients.xmldb.eXist.existdbclient as edc 4 4 5 5 def getExistClient(providerID): -
MILK/trunk/milk_server/milk_server/lib/app_globals.py
r4668 r4798 1 1 from pylons import config 2 from ndg Utils.models.vocabtermdata import VocabTermData as VTD2 from ndg.common.src.models.vocabtermdata import VocabTermData as VTD 3 3 4 4 class Globals(object): -
MILK/trunk/milk_server/milk_server/lib/ndgInterface.py
r4625 r4798 10 10 from csml_cache import CSMLExtractCache 11 11 import os, logging 12 from ndgUtils import ndgRetrieve, ndgObject, xmlHandler2 12 from ndg.common.src.dal.ndgRetrieve import ndgRetrieve 13 from ndg.common.src.models.ndgObject import ndgObject 14 from ndg.common.src.lib import xmlHandler2 13 15 from pylons import request, session 14 16 -
MILK/trunk/milk_server/milk_server/tests/functional/test_listatom.py
r4779 r4798 1 1 """ 2 Test cases for the ows retrievecontroller2 Test cases for the listatom controller 3 3 4 4 NERC Data Grid Project … … 15 15 from milk_server.tests import * 16 16 import logging, os 17 import ndg Utils.lib.existdbclient as dbc17 import ndg.common.src.clients.xmldb.eXist.existdbclient as dbc 18 18 import ndgutilstests.testconstants as tc 19 19 from ndgutilstests.testutils import testUtils as tu 20 20 from milk_server.controllers.atom_editor.editorconstants import * 21 import ndg Utils.lib.lib.htmlUtilities as utils22 from ndg Utils.models.vocabtermdata import VocabTermData as VTD21 import ndg.common.src.lib.htmlUtilities as utils 22 from ndg.common.src.models.vocabtermdata import VocabTermData as VTD 23 23 24 24 logging.basicConfig(level=logging.DEBUG, … … 41 41 def testInvalidURIIndex(self): 42 42 try: 43 url = url_for( controller='atom_editor/listatom', action='atomHome')43 url = url_for('home') 44 44 url += '/blah' 45 45 response = self.app.get(url) … … 50 50 51 51 def testAtomHome(self): 52 response = self.app.get(url_for(controller='atom_editor/listatom', \ 53 action='atomHome'), status = 200) 52 response = self.app.get(url_for('home'), status = 200) 54 53 self.assertTrue(response.body.find(ATOM_HOME_TITLE) > -1) 55 54 56 55 57 56 def testExampleGranulite(self): 58 response = self.app.get(url_for(controller='atom_editor/listatom', \ 59 action='showExampleGranulite'), status = 200) 57 response = self.app.get(url_for('example'), status = 200) 60 58 self.assertTrue(response.body.find(EXAMPLE_GRANULITE_TITLE) > -1) 61 59 62 60 63 61 def testListAtomHome(self): 64 response = self.app.get(url_for(controller='atom_editor/listatom', \ 65 action='list'), status = 200) 62 response = self.app.get(url_for('list'), status = 200) 66 63 self.assertTrue(response.body.find(LIST_ATOM_TITLE) > -1) 67 64 68 65 69 66 def testListAtomSearchDataZero(self): 70 response = self.app.get(url_for(controller='atom_editor/listatom', \ 71 action='list', searchData='0'), status = 200) 72 self.assertTrue(response.body.find(LIST_ATOM_TITLE) > -1) 73 response2 = self.app.get(url_for(controller='atom_editor/listatom', \ 74 action='list'), status = 200) 67 response = self.app.get(url_for('list', searchData='0'), status = 200) 68 self.assertTrue(response.body.find(LIST_ATOM_TITLE) > -1) 69 response2 = self.app.get(url_for('list'), status = 200) 75 70 self.assertEquals(response2.body, response.body) 76 71 … … 79 74 # NB, this will be ignored - in the absense of filter data specified, 80 75 # so should just return the standard home page 81 response = self.app.get(url_for(controller='atom_editor/listatom', \ 82 action='list', searchData='1'), status = 200) 83 self.assertTrue(response.body.find(LIST_ATOM_TITLE) > -1) 84 response2 = self.app.get(url_for(controller='atom_editor/listatom', \ 85 action='list', searchData='0'), status = 200) 76 response = self.app.get(url_for('list', searchData='1'), status = 200) 77 self.assertTrue(response.body.find(LIST_ATOM_TITLE) > -1) 78 response2 = self.app.get(url_for('list', searchData='0'), status = 200) 86 79 self.assertEquals(response.body, response2.body) 87 80 88 81 89 82 def testListAtomGranuleAssociationType(self): 90 response = self.app.get(url_for( controller='atom_editor/listatom', \91 a ction='list', \92 associationType=utils.GRANULE_ASSOCIATION),status = 200)83 response = self.app.get(url_for('list', \ 84 associationType=utils.GRANULE_ASSOCIATION), 85 status = 200) 93 86 self.assertTrue(response.body.find(GRANULE_ASSOCIATION_TITLE) > -1) 94 87 95 88 96 89 def testListAtomDeploymentAssociationType(self): 97 response = self.app.get(url_for( controller='atom_editor/listatom', \98 a ction='list', \99 associationType=utils.DEPLOYMENT_ASSOCIATION),status = 200)90 response = self.app.get(url_for('list', \ 91 associationType=utils.DEPLOYMENT_ASSOCIATION), 92 status = 200) 100 93 self.assertTrue(response.body.find(DEPLOYMENTS_ASSOCIATION_TITLE) > -1) 101 94 102 95 103 96 def testListAtomEntityAssociationType(self): 104 url = url_for(controller='atom_editor/listatom', \ 105 action='list', associationType=utils.ENTITY_ASSOCIATION) 97 url = url_for('list', associationType=utils.ENTITY_ASSOCIATION) 106 98 107 99 response = self.app.get(url, status = 200) … … 112 104 # NB, this invalid type code will be ignored - 113 105 # so should just return the standard home page 114 url = url_for(controller='atom_editor/listatom', \ 115 action='list', \ 116 associationType='69') 106 url = url_for('list', associationType='69') 117 107 response = self.app.get(url) 118 108 … … 128 118 # NB, this code determines whether listed data can be added to the 129 119 # associated atom - so will not affect the basic list set up 130 url = url_for(controller='atom_editor/listatom', \ 131 action='list', associatedAtomType='blah') 120 url = url_for('list', associatedAtomType='blah') 132 121 133 122 response = self.app.get(url, status = 200) … … 143 132 # NB, this code determines the return, save url - which will not be displayed 144 133 # without search results - so will not affect the basic list set up 145 url = url_for(controller='atom_editor/listatom', \ 146 action='list', associatedAtomID='blah') 134 url = url_for('list', associatedAtomID='blah') 147 135 148 136 response = self.app.get(url, status = 200) … … 158 146 # NB, we've created a granule in set up, so this will return at least 159 147 # one result 160 url = url_for(controller='atom_editor/listatom', \ 161 action='list', searchData='1') 148 url = url_for('list', searchData='1') 162 149 v = VTD() 163 150 provider = v.getVTI(VTD.BADC_TERM) … … 186 173 # NB, we've created a granule in set up, so this will return at least 187 174 # one result 188 url = url_for(controller='atom_editor/listatom', \ 189 action='list', searchData='1') 175 url = url_for('list', searchData='1') 190 176 v = VTD() 191 177 provider = v.getVTI(VTD.BADC_TERM) … … 215 201 # NB, we've created a granule in set up, so this will return at least 216 202 # one result 217 url = url_for(controller='atom_editor/listatom', \ 218 action='list', searchData='1') 203 url = url_for('list', searchData='1') 219 204 v = VTD() 220 205 provider = v.getVTI(VTD.BADC_TERM) -
MILK/trunk/milk_server/setup.py
r4466 r4798 13 13 "TurboKid", 14 14 "ows_common", 15 "ndgUtils", 16 "ZSI" # Used for vocab service client 15 "ndgCommon" 17 16 ], 18 17 dependency_links = ["http://ndg.nerc.ac.uk/dist"],
Note: See TracChangeset
for help on using the changeset viewer.