Changeset bffc2ad in sasview

Timestamp:

Apr 13, 2009 7: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:

• __init__.py (modified) (1 diff)
• associations.py (modified) (2 diffs)

DataLoader/readers/__init__.py

@@ -4 +4 @@
 # Method to associate extensions to default readers 
 from associations import read_associations
+
+# Method to return the location of the XML settings file
+def get_data_path():
+    """
+        Return the location of the settings file for the data readers.
+    """
+    import os
+    return os.path.dirname(__file__)

DataLoader/readers/associations.py

@@ -47 +47 @@
     return content, attr
 
-def read_associations(loader, path='defaults.xml'):
+def read_associations(loader, settings='defaults.xml'):
     """
         Read the specified settings file to associate
@@ -53 +53 @@
         
         @param loader: Loader object
-        @param path: path to the XML settings file
+        @param settings: path to the XML settings file [string]
     """
     reader_dir = os.path.dirname(__file__)
-    path = os.path.join(reader_dir, path)
+    path = os.path.join(reader_dir, settings)
+    
+    # If we can't find the file in the installation
+    # directory, look into the execution directory.
+    if not os.path.isfile(path):
+        path = os.path.join(os.getcwd(), settings)
     
     if os.path.isfile(path):