Changeset 5106


Ignore:
Timestamp:
16/03/09 11:34:40 (10 years ago)
Author:
cbyrom
Message:

Fix parsing of atom content + avoid adding newline characters for
summary + adjust test data.

Location:
ndgCommon/trunk/ndg/common
Files:
2 edited

Legend:

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

    r5081 r5106  
    686686        self.summary = [] 
    687687        for summary_line in summary.split('\n'): 
    688             self.summary.append(utilities.escapeSpecialCharacters(summary_line)) 
     688            self.summary.append(summary_line)#utilities.escapeSpecialCharacters(summary_line)) 
    689689             
    690690    Summary = property(fset=__setSummary, fget=__getSummary, doc="Atom summary") 
     
    772772            else: 
    773773                logging.debug("No file data - adding contents of element instead") 
    774                 div = contentTag.findtext('{%s}div'%ndgObject.XHTML_NS) 
     774                div = contentTag.findtext('{%s}div'%ndgObject.ATOM_NS)#XHTML_NS) 
    775775                self.Content = div 
    776776         
  • ndgCommon/trunk/ndg/common/unittests/testconstants.py

    r5097 r5106  
    3939# - whilst the tests do clean up after themselves, it's probably best not to 
    4040# run tests using a production environment DB! 
    41 #EXIST_DB = 'bora.badc.rl.ac.uk' 
     41EXIST_DB = 'bora.badc.rl.ac.uk' 
    4242#EXIST_DB = 'chinook.badc.rl.ac.uk' 
    43 EXIST_DB = 'localhost' 
     43#EXIST_DB = 'localhost' 
    4444PG_DBCONFIG_FILE = TEST_DATA_DIR + 'pg.config' 
    4545EXIST_DBCONFIG_FILE = TEST_DATA_DIR + 'exist.config' 
     
    100100logoURL = 'http://www.tessella.com/wp-content/themes/tessella/images/Tessella_Logo.png' 
    101101 
    102 title = 'this is a test granulite' 
     102title = 'this is a test atom for use with the test suite' 
    103103 
    104104datasetID = 'famous_control_month_test_file' 
Note: See TracChangeset for help on using the changeset viewer.