sys-file-reader: Ignore subtype 24 written by SPSS 21.

Reported by Mindaugus.

diff --git a/doc/dev/system-file-format.texi b/doc/dev/system-file-format.texi
index e98b718883e1ef7507e48c4f39fdc0d19fd9198f..062738181baa6923144e5af332c59355e6ee3a17 100644 (file)
--- a/doc/dev/system-file-format.texi
+++ b/doc/dev/system-file-format.texi
@@ -1253,7 +1253,9 @@ Record type.  Always set to 7.
 @item int32 subtype;
 Record subtype.  May take any value.  According to Aapi
 H@"am@"al@"ainen, value 5 indicates a set of grouped variables and 6
 @item int32 subtype;
 Record subtype.  May take any value.  According to Aapi
 H@"am@"al@"ainen, value 5 indicates a set of grouped variables and 6

-indicates date info (probably related to USE).
+indicates date info (probably related to USE).  Subtype 24 appears to
+contain XML that describes how data in the file should be displayed
+on-screen.

 
 @item int32 size;
 Size of each piece of data in the data part.  Should have the value 1,
 
 @item int32 size;
 Size of each piece of data in the data part.  Should have the value 1,

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index a03a317a450720760926e19d2c2a076b34f84e81..fcc2f2d76caec9881d193c26b1186f8fcd168a86 100644 (file)
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -83,7 +83,8 @@ enum
     EXT_VAR_ATTRS     = 18,     /* Variable attributes. */
     EXT_MRSETS2       = 19,     /* Multiple response sets (extended). */
     EXT_ENCODING      = 20,     /* Character encoding. */
     EXT_VAR_ATTRS     = 18,     /* Variable attributes. */
     EXT_MRSETS2       = 19,     /* Multiple response sets (extended). */
     EXT_ENCODING      = 20,     /* Character encoding. */

-    EXT_LONG_LABELS   = 21      /* Value labels for long strings. */
+    EXT_LONG_LABELS   = 21,     /* Value labels for long strings. */
+    EXT_DATAVIEW      = 24      /* "Format properties in dataview table". */

   };
 
 /* Fields from the top-level header record. */
   };
 
 /* Fields from the top-level header record. */


@@ -887,6 +888,7 @@ read_extension_record (struct sfm_reader *r, int subtype)
       { EXT_VAR_SETS,     0, 0 },
       { EXT_DATE,         0, 0 },
       { EXT_DATA_ENTRY,   0, 0 },
       { EXT_VAR_SETS,     0, 0 },
       { EXT_DATE,         0, 0 },
       { EXT_DATA_ENTRY,   0, 0 },

+      { EXT_DATAVIEW,     0, 0 },

     };
 
   const struct extension_record_type *type;
     };
 
   const struct extension_record_type *type;