Changes in src/sas/sascalc/dataloader/readers/cansas_reader.py [654e8e0:5f26aa4] in sasview

File:

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

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

@@ -62 +62 @@
     type_name = "canSAS"
     invalid = True
-    frm = ""
     ## Log messages and errors
     logging = None
@@ -139 +138 @@
                     for entry in entry_list:
                         # Create a new DataInfo object for every <SASentry>
+
 
                         # Set the file name and then parse the entry.
@@ -183 +183 @@
         return self.output
 
-    def _parse_entry(self, dom, recurse=False):
+    def _parse_entry(self, dom):
         """
         Parse a SASEntry - new recursive method for parsing the dom of
@@ -192 +192 @@
         """
 
-        if not self._is_call_local() and not recurse:
+        frm = inspect.stack()[1]
+        if not self._is_call_local(frm):
             self.reset_state()
             self.add_data_set()
@@ -200 +201 @@
         self.base_ns = "{0}{1}{2}".format("{", \
                             CANSAS_NS.get(self.cansas_version).get("ns"), "}")
+        tagname = ''
+        tagname_original = ''
 
         # Go through each child in the parent element
@@ -222 +225 @@
                     self._initialize_new_data_set()
                 ## Recursion step to access data within the group
-                self._parse_entry(node, True)
+                self._parse_entry(node)
                 if tagname == "SASsample":
                     self.current_datainfo.sample.name = name
@@ -434 +437 @@
                 length = len(self.names) - 1
             self.parent_class = self.names[length]
-        if not self._is_call_local() and not recurse:
-            self.frm = ""
+        if not self._is_call_local(frm):
             self.add_data_set()
             empty = None
@@ -446 +448 @@
 
 
-    def _is_call_local(self):
-        """
-
-        """
-        if self.frm == "":
-            inter = inspect.stack()
-            self.frm = inter[2]
-        mod_name = self.frm[1].replace("\\", "/").replace(".pyc", "")
+    def _is_call_local(self, frm=""):
+        """
+
+        :return:
+        """
+        if frm == "":
+            frm = inspect.stack()[1]
+        mod_name = frm[1].replace("\\", "/").replace(".pyc", "")
         mod_name = mod_name.replace(".py", "")
         mod = mod_name.split("sas/")
@@ -834 +836 @@
         # If the calling function was not the cansas reader, return a minidom
         #      object rather than an lxml object.
-        self.frm = inspect.stack()[1]
-        doc, entry_node = self._check_origin(entry_node, doc)
+        frm = inspect.stack()[1]
+        doc, entry_node = self._check_origin(entry_node, doc, frm)
         return doc, entry_node
 
@@ -1230 +1232 @@
                 self.append(node, entry_node)
 
-    def _check_origin(self, entry_node, doc):
+    def _check_origin(self, entry_node, doc, frm):
         """
         Return the document, and the SASentry node associated with
@@ -1240 +1242 @@
         :param doc: entire xml tree
         """
-        if not self.frm:
-            self.frm = inspect.stack()[1]
-        mod_name = self.frm[1].replace("\\", "/").replace(".pyc", "")
+        if not frm:
+            frm = inspect.stack()[1]
+        mod_name = frm[1].replace("\\", "/").replace(".pyc", "")
         mod_name = mod_name.replace(".py", "")
         mod = mod_name.split("sas/")