Changeset 88e289c in sasview

Timestamp:

Apr 9, 2009 5:45:30 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:

d508be9

Parents:

9181512

Message:

Modified the file extension associations for release 1.0. Modified the loader to default to the n-col ascii reader when no reader is found.

Location:

DataLoader

Files:

• loader.py (modified) (2 diffs)
• readers/defaults.xml (modified) (1 diff)

DataLoader/loader.py

@@ -33 +33 @@
 # Default readers are defined in the readers sub-module
 import readers
+from readers import ascii_reader
 
 class Registry(ExtensionRegistry):
@@ -61 +62 @@
         self.find_plugins('plugins')
 
+        
+    def load(self, path, format=None):
+        """
+            Call the loader for the file type of path.
+    
+            @param path: file path
+            @param format: explicit extension, to force the use of a particular reader
+    
+            Defaults to the ascii (multi-column) reader
+            if no reader was registered for the file's
+            extension.   
+        """
+        try:
+            return super(Registry, self).load(path, format=format)
+        except:
+            # No reader was found. Default to the ascii reader.
+            ascii_loader = ascii_reader.Reader()
+            return ascii_loader.read(path)
         
     def find_plugins(self, dir):

DataLoader/readers/defaults.xml

@@ -4 +4 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     >
-        <FileType extension='.abs' reader='abs_reader'/>
-        <FileType extension='.abs' reader='ascii_reader'/>
         
-        <FileType extension='.txt' reader='ascii_reader'/>
-        <FileType extension='.dat' reader='ascii_reader'/>
-
         <FileType extension='.xml' reader='cansas_reader'/>
-        
-        <FileType extension='.sans' reader='danse_reader'/>
-        
-        <FileType extension='.d1d' reader='hfir1d_reader'/>
-        
-        <FileType extension='.asc' reader='IgorReader'/>
-        
-        <FileType extension='.tif' reader='tiff_reader'/>
-        <FileType extension='.tiff' reader='tiff_reader'/>
     
 </SansLoader>