Changeset 5019 for ndgCommon/trunk


Ignore:
Timestamp:
23/02/09 16:43:03 (11 years ago)
Author:
cbyrom
Message:

Move deployments + DE lookup URLs for atoms to within Atom data model

  • to tidy up handling in MILK stack + tidy up a few tests.
Location:
ndgCommon/trunk/ndg/common
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ndgCommon/trunk/ndg/common/src/models/Atom.py

    r4983 r5019  
    342342        if self.atomTypeID: 
    343343            self.atomTypeName = self.VTD.TERM_DATA[self.atomTypeID].title 
     344 
     345 
     346        self.deploymentsURL = "" 
     347        self.dataEntitiesURL = "" 
    344348 
    345349        logging.info("Atom initialised") 
  • ndgCommon/trunk/ndg/common/src/models/ndgObject.py

    r5010 r5019  
    5656    BURL=None 
    5757     
    58     def __init__(self, uri, config=None): 
     58    def __init__(self, uri, config = None): 
    5959        '''  
    6060        Parse the uri and prepare for obtaining the actual content 
  • ndgCommon/trunk/ndg/common/unittests/clients/xmldb/eXist/testfeedclient.py

    r4997 r5019  
    6969            self.assertTrue(feed.feed.has_key('links')) 
    7070        except Exception, e: 
    71             import pdb 
    72             pdb.set_trace() 
    73             self.fail("Should not have thrown an exception") 
     71            self.fail("Should not have thrown an exception (%s)" %e) 
    7472 
    7573    def testInvalidGetAtomFeed(self): 
  • ndgCommon/trunk/ndg/common/unittests/testconstants.py

    r5012 r5019  
    4040# - whilst the tests do clean up after themselves, it's probably best not to 
    4141# run tests using a production environment DB! 
    42 #EXIST_DB = 'chinook.badc.rl.ac.uk' 
    43 EXIST_DB = 'localhost' 
     42EXIST_DB = 'chinook.badc.rl.ac.uk' 
     43#EXIST_DB = 'localhost' 
    4444PG_DBCONFIG_FILE = TEST_DATA_DIR + 'pg.config' 
    4545EXIST_DBCONFIG_FILE = TEST_DATA_DIR + 'exist.config' 
  • ndgCommon/trunk/ndg/common/xmldb/schema/README.txt

    r4810 r5019  
    1 All the schemata required for running schema validations of atom docs are included 
     1All the schemas required for running schema validations of atom docs are included 
    22here; this allows them to be directly ingested into the eXist DB used as the atom 
    33doc repository - so this does not need to be set up with access beyond any 
Note: See TracChangeset for help on using the changeset viewer.