cleanup

diff --git a/rust/pspp/src/spv/read/legacy_xml.rs b/rust/pspp/src/spv/read/legacy_xml.rs
index 5088fa8ad06c1bf1c99dc471e01b94d219552362..c02cbd3d7003392ac78e614560ad18ff6d369f8e 100644 (file)
--- a/rust/pspp/src/spv/read/legacy_xml.rs
+++ b/rust/pspp/src/spv/read/legacy_xml.rs
@@ -900,17 +900,13 @@ impl SourceVariable {
         } else {
             Vec::new()
         };
-        let mut map = if let Some(format) = &self.format {
-            Map::from_format(format).0
+        if let Some(format) = &self.format {
+            Map::from_format(format).0.apply(&mut data);
         } else if let Some(string_format) = &self.string_format {
-            Map::from_string_format(string_format)
-        } else {
-            Map::new()
+            Map::from_string_format(string_format).apply(&mut data);
         };
-        if !map.0.is_empty() {
-            map.apply(&mut data);
-            map = Map::new();
-        } else if let Some(label_series) = label_series {
+        let mut map = Map::new();
+        if let Some(label_series) = label_series {
             map.insert_labels(
                 &data,
                 label_series,
@@ -997,12 +993,6 @@ impl DerivedVariable {
         let mut map = Map::from_vmes(&self.value_map);
         map.apply(&mut values);
         map.remap_formats(&self.format, &self.string_format);
-        if values
-            .iter()
-            .all(|value| value.value.is_string_and(|s| s.is_empty()))
-        {
-            values.clear();
-        }
         series.insert(&self.id, Series::new(self.id.clone(), values, map));
         true
     }