Changeset 0a5c8f5 in sasview for sansdataloader/src

Timestamp:

Feb 7, 2012 12:55:23 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

9cd0baa

Parents:

e7e1fdd

Message:

accept non standard extension for xml

File:

• sansdataloader/src/sans/dataloader/readers/cansas_reader.py (modified) (2 diffs)

sansdataloader/src/sans/dataloader/readers/cansas_reader.py

@@ -46 +46 @@
 
 CANSAS_NS = "cansas1d/1.0"
+allow_all = True
 
 def write_node(doc, parent, name, value, attr={}):
@@ -146 +147 @@
             basename  = os.path.basename(path)
             root, extension = os.path.splitext(basename)
-            if extension.lower() in self.ext:
-                
-                tree = etree.parse(path, parser=etree.ETCompatXMLParser())
-                # Check the format version number
-                # Specifying the namespace will take care of the file
-                # format version 
-                root = tree.getroot()
-                
-                entry_list = root.xpath('/ns:SASroot/ns:SASentry',
-                                         namespaces={'ns': CANSAS_NS})
-                
-                for entry in entry_list:
-                    self.errors = []
-                    sas_entry = self._parse_entry(entry)
-                    sas_entry.filename = basename
+            if allow_all or extension.lower() in self.ext:
+                try:
+                    tree = etree.parse(path, parser=etree.ETCompatXMLParser())
+                    # Check the format version number
+                    # Specifying the namespace will take care of the file
+                    # format version 
+                    root = tree.getroot()
                     
-                    # Store loading process information
-                    sas_entry.errors = self.errors
-                    sas_entry.meta_data['loader'] = self.type_name
-                    output.append(sas_entry)
-                
+                    entry_list = root.xpath('/ns:SASroot/ns:SASentry',
+                                             namespaces={'ns': CANSAS_NS})
+                    
+                    for entry in entry_list:
+                        self.errors = []
+                        sas_entry = self._parse_entry(entry)
+                        sas_entry.filename = basename
+                        
+                        # Store loading process information
+                        sas_entry.errors = self.errors
+                        sas_entry.meta_data['loader'] = self.type_name
+                        output.append(sas_entry)
+                except:
+                    raise RuntimeError, "%s cannot be read \n" % path
         else:
             raise RuntimeError, "%s is not a file" % path