Show
Ignore:
Timestamp:
06/26/07 15:31:21 (1 year ago)
Author:
madarche
Message:

- Fixed reference in the comments and messages to config.xml file which is now a

constant that may change.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OOo/ooo2dbk/trunk/CHANGES

    r50742 r51878  
    77Bug fixes 
    88~~~~~~~~~ 
    9 - 
     9- Fixed reference in the comments and messages to config.xml file which is now a 
     10  constant that may change. 
    1011New internal features 
    1112~~~~~~~~~~~~~~~~~~~~~ 

  • OOo/ooo2dbk/trunk/ooo2dbk

    r50612 r51878  
    11#!/usr/bin/python 
    2 # (C) Copyright 2003-2006 Nuxeo SAS <http://nuxeo.com> 
     2# (C) Copyright 2003-2007 Nuxeo SAS <http://nuxeo.com> 
    33# (C) Copyright 2002 Eric Bellot <ebellot@netcourrier.com> 
    44# 
    …… 
    271271def getXSLfile(oooVersion): 
    272272 
    273     # Using the XSLT stylesheets specified in the config.xml file 
     273    # Using the XSLT stylesheets specified in the CONF_FILE_NAME file 
    274274    stylesheet_file_name = getConfigValue('xslt-stylesheet', 
    275275                                              'stylesheetPath', 
    …… 
    277277    stylesheet_file_name = verifPath(stylesheet_file_name) 
    278278    if stylesheet_file_name == None: 
    279         print "Bad filename %s for 'xslt-stylesheet' %s in 'config.xml'" % ( 
     279        print "Bad filename %s for 'xslt-stylesheet' %s in '%s'" % ( 
    280280                                                stylesheet_file_name, 
    281                                                 oooVersion ) 
     281                                                oooVersion, 
     282                                                CONF_FILE_NAME, 
     283                        ) 
    282284 
    283285    xsltfile = os.path.join(getModulePath(), stylesheet_file_name) 
    …… 
    327329    verifPathIRD = re.match(r"^[a-zA-Z0-9]+$", imgRelDir) 
    328330    if verifPathIRD == None: 
    329         msg = ("Only one depth relative directory (no '" + os.sep + "') " 
    330                "and only alphanum chars for 'imagesRelativeDirectory' in 'config.xml'\n" 
    331                "Actual name is : '" + imgRelDir + "'") 
     331        msg = ("Only one depth relative directory (no '%s') " 
     332               "and only alphanum chars for 'imagesRelativeDirectory' in '%s'\n" 
     333               "Actual name is : '%s'" 
     334               % (os.sep, CONF_FILE_NAME, imgRelDir)) 
    332335        print msg 
    333336        sys.exit(1) 
    …… 
    336339    verifPathIR = re.match(r"^[a-zA-Z0-9]+$", imgRootName) 
    337340    if verifPathIR == None: 
    338         print "Only alphanum chars for 'imageNameRoot' in 'config.xml'" 
     341        print "Only alphanum chars for 'imageNameRoot' in '%s'" % CONF_FILE_NAME 
    339342        print "Actual name is :", imgRootName 
    340343        sys.exit(1) 
    …… 
    349352def getConfigValue(element, attribute, name=''): 
    350353    """ 
    351     Return from the config.xml file the value of the specified attribute 
     354    Return from the CONF_FILE_NAME file the value of the specified attribute 
    352355    ('command', 'param-syntax', etc.) for the specified element type 
    353356    'xslt-command', 'xslt-stylesheet', etc.) with its 'name' attribute having 
    …… 
    372375        if name != '': 
    373376            print ("There isn't any value for this parameter. " 
    374                    "There should be an error in your config.xml.") 
     377                   "There should be an error in your %s." % CONF_FILE_NAME) 
    375378            sys.exit(1) 
    376379