cleanup

diff --git a/rust/pspp/src/spv/read/legacy_xml.rs b/rust/pspp/src/spv/read/legacy_xml.rs
index c02cbd3d7003392ac78e614560ad18ff6d369f8e..90c3088347b96f0ecd4d573f356a93a9498905a7 100644 (file)
--- a/rust/pspp/src/spv/read/legacy_xml.rs
+++ b/rust/pspp/src/spv/read/legacy_xml.rs
@@ -76,7 +76,7 @@ impl Map {
         Self::default()
     }
 
-    fn from_format(format: &Format) -> (Self, crate::format::Format) {
+    fn from_format(format: &Format) -> Self {
         let f = format.decode();
         let mut map = Self::new();
         for relabel in &format.relabels {
@@ -92,7 +92,7 @@ impl Map {
             };
             map.0.insert(OrderedFloat(relabel.from), value);
         }
-        (map, f)
+        map
     }
 
     fn from_string_format(string_format: &StringFormat) -> Self {
@@ -901,7 +901,7 @@ impl SourceVariable {
             Vec::new()
         };
         if let Some(format) = &self.format {
-            Map::from_format(format).0.apply(&mut data);
+            Map::from_format(format).apply(&mut data);
         } else if let Some(string_format) = &self.string_format {
             Map::from_string_format(string_format).apply(&mut data);
         };
@@ -990,10 +990,13 @@ impl DerivedVariable {
             });
             vec![]
         };
-        let mut map = Map::from_vmes(&self.value_map);
-        map.apply(&mut values);
-        map.remap_formats(&self.format, &self.string_format);
-        series.insert(&self.id, Series::new(self.id.clone(), values, map));
+        Map::from_vmes(&self.value_map).apply(&mut values);
+        if let Some(format) = &self.format {
+            Map::from_format(format).apply(&mut values);
+        } else if let Some(string_format) = &self.string_format {
+            Map::from_string_format(string_format).apply(&mut values);
+        };
+        series.insert(&self.id, Series::new(self.id.clone(), values, Map::new()));
         true
     }
 }