work

[pspp] / rust / src / cooked.rs

diff --git a/rust/src/cooked.rs b/rust/src/cooked.rs
index c6eabecdbf17bf6942f67874b8f5ef99fb637103..4c0135b949ff365b0a4ca4f2c26c5b600b3165ab 100644 (file)
--- a/rust/src/cooked.rs
+++ b/rust/src/cooked.rs
@@ -215,8 +215,8 @@ struct Headers<'a> {
     variable_sets: Vec<&'a raw::TextRecord>,
     var_display: Option<&'a raw::VarDisplayRecord>,
     multiple_response: Vec<&'a raw::MultipleResponseRecord<RawString>>,
-    long_string_value_labels: Vec<&'a raw::LongStringValueLabelRecord>,
-    long_string_missing_values: Vec<&'a raw::LongStringMissingValueRecord>,
+    long_string_value_labels: Vec<&'a raw::LongStringValueLabelRecord<RawString>>,
+    long_string_missing_values: Vec<&'a raw::LongStringMissingValueRecord<RawString, RawStr<8>>>,
     encoding: Option<&'a raw::EncodingRecord>,
     number_of_cases: Option<&'a raw::NumberOfCasesRecord>,
     product_info: Option<&'a raw::TextRecord>,
@@ -239,6 +239,7 @@ fn set_or_warn<T>(option: &mut Option<T>, value: T, warn: &impl Fn(Error)) {
 impl<'a> Headers<'a> {
     fn new(headers: &'a Vec<raw::Record>, warn: &impl Fn(Error)) -> Headers<'a> {
         let mut h = Headers::default();
+/*
         for header in headers {
             match header {
                 raw::Record::Header(record) => set_or_warn(&mut h.header, record, warn),
@@ -272,6 +273,7 @@ impl<'a> Headers<'a> {
                 raw::Record::Cases(record) => set_or_warn(&mut h.cases, record, warn),
             }
         }
+*/
         h
     }
 }
@@ -1316,7 +1318,7 @@ pub struct LongStringMissingValues {
 impl LongStringMissingValues {
     fn decode(
         decoder: &Decoder,
-        input: &raw::LongStringMissingValues,
+        input: &raw::LongStringMissingValues<RawString, RawStr<8>>,
         warn: &impl Fn(Error),
     ) -> Result<Self, Error> {
         let var_name = decoder.decode_string(&input.var_name.0, warn);
@@ -1336,7 +1338,7 @@ impl LongStringMissingValues {
 pub struct LongStringMissingValuesRecord(Vec<LongStringMissingValues>);
 
 impl TryDecode for LongStringMissingValuesRecord {
-    type Input<'a> = raw::LongStringMissingValueRecord;
+    type Input<'a> = raw::LongStringMissingValueRecord<RawString, RawStr<8>>;
 
     fn try_decode(
         decoder: &mut Decoder,
@@ -1364,7 +1366,7 @@ pub struct LongStringValueLabels {
 impl LongStringValueLabels {
     fn decode(
         decoder: &Decoder,
-        input: &raw::LongStringValueLabels,
+        input: &raw::LongStringValueLabels<RawString>,
         warn: &impl Fn(Error),
     ) -> Result<Self, Error> {
         let var_name = decoder.decode_string(&input.var_name.0, warn);
@@ -1402,7 +1404,7 @@ impl LongStringValueLabels {
 pub struct LongStringValueLabelRecord(pub Vec<LongStringValueLabels>);
 
 impl TryDecode for LongStringValueLabelRecord {
-    type Input<'a> = raw::LongStringValueLabelRecord;
+    type Input<'a> = raw::LongStringValueLabelRecord<RawString>;
 
     fn try_decode(
         decoder: &mut Decoder,