Fix support for type 'E' multiple response sets in SPSS SAV files

Author: slobodan-ilic

src/spss/readstat_sav.h

@@ -122,6 +122,7 @@ typedef struct sav_ctx_s {
 #define SAV_RECORD_SUBTYPE_INTEGER_INFO       3
 #define SAV_RECORD_SUBTYPE_FP_INFO            4
 #define SAV_RECORD_SUBTYPE_MULTIPLE_RESPONSE_SETS 7
+#define SAV_RECORD_SUBTYPE_MULTIPLE_RESPONSE_SETS_V14 19
 #define SAV_RECORD_SUBTYPE_PRODUCT_INFO      10
 #define SAV_RECORD_SUBTYPE_VAR_DISPLAY       11
 #define SAV_RECORD_SUBTYPE_LONG_VAR_NAME     13

src/spss/readstat_sav_parse_mr_name.rl

@@ -94,14 +94,28 @@
 
     nc = (alnum | '_' | '.' ); # name character (including dots)
     name = nc+ '=' > extract_mr_name;
-    type = ('C' | 'D'){1} > extract_mr_type;
+    
+    # Define types
+    c_type = 'C' > extract_mr_type;
+    d_type = 'D' > extract_mr_type;
+    e_type = 'E' > extract_mr_type;
+    
+    # For type E, we need an optional pattern for the additional parameters
+    e_params = ' ' ('1' | '11') ' ';
+    
     counted_value = digit* ' ' > extract_counted_value;
     label = digit+ ' '+ > extract_label;
 
     end = (space | '\0'); # subvar token terminator
     subvariable = (nc+ end >extract_subvar);
 
-    main := name type counted_value label subvariable+;
+    # Define patterns for each type
+    c_pattern = c_type counted_value label subvariable+;
+    d_pattern = d_type counted_value label subvariable+;
+    e_pattern = e_type e_params counted_value label subvariable+;
+    
+    # Main pattern is one of the type patterns
+    main := name (c_pattern | d_pattern | e_pattern);
 
     write data nofinal noerror;
 }%%
@@ -142,7 +156,7 @@ readstat_error_t extract_mr_data(const char *line, mr_set_t *result) {
     result->counted_value = mr_counted_value;
     result->subvariables = mr_subvariables;
     result->num_subvars = mr_subvar_count;
-    if (result->type == 'D') {
+    if (result->type == 'D' || result->type == 'E') {
         result->is_dichotomy = 1;
     }
 

src/spss/readstat_sav_read.c

@@ -1364,7 +1364,7 @@ static readstat_error_t sav_parse_records_pass1(sav_ctx_t *ctx) {
                     retval = sav_parse_machine_integer_info_record(data_buf, data_len, ctx);
                     if (retval != READSTAT_OK)
                         goto cleanup;
-                } else if (subtype == SAV_RECORD_SUBTYPE_MULTIPLE_RESPONSE_SETS) {
+                } else if (subtype == SAV_RECORD_SUBTYPE_MULTIPLE_RESPONSE_SETS || subtype == SAV_RECORD_SUBTYPE_MULTIPLE_RESPONSE_SETS_V14) {
                     if (ctx->mr_sets != NULL) {
                         retval = READSTAT_ERROR_BAD_MR_STRING;
                         goto cleanup;