Changes in / [3d6c010:a2e980b] in sasview

Location:

src/sas/sascalc/dataloader/readers

Files:

• cansas_reader.py (modified) (9 diffs)
• cansas_reader_BACKUP_72072.py (deleted)
• cansas_reader_BASE_72072.py (deleted)
• cansas_reader_LOCAL_72072.py (deleted)
• cansas_reader_REMOTE_72072.py (deleted)

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

@@ -209 +209 @@
             name = attr.get("name", "")
             type = attr.get("type", "")
-            unit = attr.get("unit", "")
             # Get the element name and set the current names level
             tagname = node.tag.replace(self.base_ns, "")
@@ -249 +248 @@
                     unit = attr.get('unit', '')
                 else:
-                    data_point, unit = self._get_node_value(node)
+                    data_point, unit = self._get_node_value(node, tagname)
 
                 # If this is a dataset, store the data appropriately
@@ -692 +691 @@
         return name
 
-    def _get_node_value_from_text(self, node, node_text):
-        """
-        Get the value of a node and any applicable units
-
-        :param node: The XML node to get the value of
-        :param tagname: The tagname of the node
-        """
-        units = ""
-        # If the value is a float, compile with units.
-        if self.ns_list.ns_datatype == "float":
-            # If an empty value is given, set as zero.
-            if node_text is None or node_text.isspace() \
-                    or node_text.lower() == "nan":
-                node_text = "0.0"
-            # Convert the value to the base units
-            tag = node.tag.replace(self.base_ns, "")
-            node_text, units = self._unit_conversion(node, tag, node_text)
-
-        # If the value is a timestamp, convert to a datetime object
-        elif self.ns_list.ns_datatype == "timestamp":
-            if node_text is None or node_text.isspace():
-                pass
-            else:
-                try:
-                    node_text = \
-                        datetime.datetime.fromtimestamp(node_text)
-                except ValueError:
-                    node_text = None
-        return node_text, units
-
-    def _get_node_value(self, node):
+    def _get_node_value(self, node, tagname):
         """
         Get the value of a node and any applicable units
@@ -736 +705 @@
         else:
             node_value = ""
-        node_value, units = self._get_node_value_from_text(node, node_value)
+
+        # If the value is a float, compile with units.
+        if self.ns_list.ns_datatype == "float":
+            # If an empty value is given, set as zero.
+            if node_value is None or node_value.isspace() \
+                                    or node_value.lower() == "nan":
+                node_value = "0.0"
+            #Convert the value to the base units
+            node_value, units = self._unit_conversion(node, tagname, node_value)
+
+        # If the value is a timestamp, convert to a datetime object
+        elif self.ns_list.ns_datatype == "timestamp":
+            if node_value is None or node_value.isspace():
+                pass
+            else:
+                try:
+                    node_value = \
+                        datetime.datetime.fromtimestamp(node_value)
+                except ValueError:
+                    node_value = None
         return node_value, units
 
@@ -940 +928 @@
             self._write_data_2d(datainfo, entry_node)
         else:
-            if self._check_root():
-                self._write_data(datainfo, entry_node)
-            else:
-                self._write_data_linearized(datainfo, entry_node)
+            self._write_data(datainfo, entry_node)
         # Transmission Spectrum Info
         # TODO: fix the writer to linearize all data, including T_spectrum
@@ -1009 +994 @@
             url = "http://www.cansas.org/formats/1.1/"
         else:
-            url = "http://www.cansas.org/formats/1.0/"
+            url = "http://svn.smallangles.net/svn/canSAS/1dwg/trunk/"
         schema_location = "{0} {1}cansas1d.xsd".format(n_s, url)
         attrib = {"{" + xsi + "}schemaLocation" : schema_location,
@@ -1367 +1352 @@
                 {"unit": item.slit_length_unit})
 
+
     def _write_process_notes(self, datainfo, entry_node):
         """
@@ -1414 +1400 @@
                 self.append(node, entry_node)
 
-    def _check_root(self):
+    def _check_origin(self, entry_node, doc):
         """
         Return the document, and the SASentry node associated with
@@ -1425 +1411 @@
         """
         if not self.frm:
-            self.frm = inspect.stack()[2]
+            self.frm = inspect.stack()[1]
         mod_name = self.frm[1].replace("\\", "/").replace(".pyc", "")
         mod_name = mod_name.replace(".py", "")
         mod = mod_name.split("sas/")
         mod_name = mod[1]
-        return mod_name == "sascalc/dataloader/readers/cansas_reader"
-
-    def _check_origin(self, entry_node, doc):
-        """
-        Return the document, and the SASentry node associated with
-        the data we just wrote.
-        If the calling function was not the cansas reader, return a minidom
-        object rather than an lxml object.
-
-        :param entry_node: lxml node ElementTree object to be appended to
-        :param doc: entire xml tree
-        """
-        if not self._check_root():
+        if mod_name != "sascalc/dataloader/readers/cansas_reader":
             string = self.to_string(doc, pretty_print=False)
             doc = parseString(string)