Changeset 3ece5dd in sasview for src/sas/sascalc/dataloader/readers/cansas_reader.py

Timestamp:

Jul 26, 2017 6:31:27 AM (7 years ago)

Author:

lewis

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

bc570f4

Parents:

371b9e2

Message:

Raise and catch correct exceptions in CanSAS XML reader

File:

• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (6 diffs)

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -29 +29 @@
 from sas.sascalc.dataloader.readers.xml_reader import XMLreader
 from sas.sascalc.dataloader.readers.cansas_constants import CansasConstants, CurrentLevel
-from sas.sascalc.dataloader.loader_exceptions import FileContentsException
+from sas.sascalc.dataloader.loader_exceptions import FileContentsException, \
+    DefaultReaderException, DataReaderException
 
 # The following 2 imports *ARE* used. Do not remove either.
@@ -123 +124 @@
         if os.path.isfile(xml_file):
             basename, extension = os.path.splitext(os.path.basename(xml_file))
-            # If the file type is not allowed, return nothing
-            if extension in self.ext or self.allow_all:
+            try:
                 # Get the file location of
                 self.load_file_and_schema(xml_file, schema_path)
@@ -130 +130 @@
                 # Try to load the file, but raise an error if unable to.
                 # Check the file matches the XML schema
+                self.is_cansas(extension) # Raises FileContentsException if not CanSAS
+                self.invalid = False
+                # Get each SASentry from XML file and add it to a list.
+                entry_list = self.xmlroot.xpath(
+                        '/ns:SASroot/ns:SASentry',
+                        namespaces={'ns': self.cansas_defaults.get("ns")})
+                self.names.append("SASentry")
+
+                # Get all preprocessing events and encoding
+                self.set_processing_instructions()
+
+                # Parse each <SASentry> item
+                for entry in entry_list:
+                    # Create a new DataInfo object for every <SASentry>
+
+                    # Set the file name and then parse the entry.
+                    self.current_datainfo.filename = basename + extension
+                    self.current_datainfo.meta_data["loader"] = "CanSAS XML 1D"
+                    self.current_datainfo.meta_data[PREPROCESS] = \
+                        self.processing_instructions
+
+                    # Parse the XML SASentry
+                    self._parse_entry(entry)
+                    # Combine datasets with datainfo
+                    self.add_data_set()
+            except FileContentsException as fc_exc:
                 try:
-                    self.is_cansas(extension)
-                    self.invalid = False
-                    # Get each SASentry from XML file and add it to a list.
-                    entry_list = self.xmlroot.xpath(
-                            '/ns:SASroot/ns:SASentry',
-                            namespaces={'ns': self.cansas_defaults.get("ns")})
-                    self.names.append("SASentry")
-
-                    # Get all preprocessing events and encoding
-                    self.set_processing_instructions()
-
-                    # Parse each <SASentry> item
-                    for entry in entry_list:
-                        # Create a new DataInfo object for every <SASentry>
-
-                        # Set the file name and then parse the entry.
-                        self.current_datainfo.filename = basename + extension
-                        self.current_datainfo.meta_data["loader"] = "CanSAS XML 1D"
-                        self.current_datainfo.meta_data[PREPROCESS] = \
-                            self.processing_instructions
-
-                        # Parse the XML SASentry
-                        self._parse_entry(entry)
-                        # Combine datasets with datainfo
-                        self.add_data_set()
-                except RuntimeError:
                     # If the file does not match the schema, raise this error
                     invalid_xml = self.find_invalid_xml()
@@ -170 +170 @@
                         invalid_schema = INVALID_SCHEMA_PATH_1_0.format(base, self.cansas_defaults.get("schema"))
                     self.set_schema(invalid_schema)
-                    try:
-                        if self.invalid:
-                            if self.is_cansas():
-                                self.output = self.read(xml_file, invalid_schema, False)
-                            else:
-                                raise RuntimeError
-                        else:
-                            raise RuntimeError
-                    except RuntimeError:
-                        x = np.zeros(1)
-                        y = np.zeros(1)
-                        self.current_data1d = Data1D(x,y)
-                        self.current_data1d.errors = self.errors
-                        return [self.current_data1d]
+                    if self.invalid:
+                        self.output = self.read(xml_file, invalid_schema, False)
+                    else:
+                        raise fc_exc
+                except FileContentsException as fc_exc:
+                    msg = "CanSAS Reader could not load the file {}".format(xml_file)
+                    if not extension in self.ext:
+                        raise DefaultReaderException(msg)
+                    if fc_exc.message is not None:
+                        msg = fc_exc.message
+                    raise FileContentsException(msg)
+                except Exception as e:
+                    raise FileContentsException(e.message)
         else:
             self.output.append("Not a valid file path.")
@@ -525 +524 @@
         if ext == "svs":
             return True
-        raise RuntimeError
+        raise FileContentsException("Not valid CanSAS")
 
     def load_file_and_schema(self, xml_file, schema_path=""):
@@ -543 +542 @@
             self.set_xml_file(xml_file)
         except etree.XMLSyntaxError:
-            msg = "Cansas cannot load this file"
-            raise FileContentsException, msg
+            msg = "Cansas cannot load {}.\n Invalid XML syntax.".format(xml_file)
+            raise FileContentsException(msg)
         self.cansas_version = self.xmlroot.get("version", "1.0")