Changeset bffc2ad in sasview


Ignore:
Timestamp:
Apr 13, 2009 9:05:10 PM (16 years ago)
Author:
Mathieu Doucet <doucetm@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
25b9c26d
Parents:
ff36f31
Message:

dataloader: added function to get location of settings file, added functionality to default to CWD when looking for that settings file

Location:
DataLoader/readers
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • DataLoader/readers/__init__.py

    r28caa03 rbffc2ad  
    44# Method to associate extensions to default readers  
    55from associations import read_associations 
     6 
     7# Method to return the location of the XML settings file 
     8def get_data_path(): 
     9    """ 
     10        Return the location of the settings file for the data readers. 
     11    """ 
     12    import os 
     13    return os.path.dirname(__file__) 
  • DataLoader/readers/associations.py

    r28caa03 rbffc2ad  
    4747    return content, attr 
    4848 
    49 def read_associations(loader, path='defaults.xml'): 
     49def read_associations(loader, settings='defaults.xml'): 
    5050    """ 
    5151        Read the specified settings file to associate 
     
    5353         
    5454        @param loader: Loader object 
    55         @param path: path to the XML settings file 
     55        @param settings: path to the XML settings file [string] 
    5656    """ 
    5757    reader_dir = os.path.dirname(__file__) 
    58     path = os.path.join(reader_dir, path) 
     58    path = os.path.join(reader_dir, settings) 
     59     
     60    # If we can't find the file in the installation 
     61    # directory, look into the execution directory. 
     62    if not os.path.isfile(path): 
     63        path = os.path.join(os.getcwd(), settings) 
    5964     
    6065    if os.path.isfile(path): 
Note: See TracChangeset for help on using the changeset viewer.