Rewrite system file reader code, to clean up and improve.

[pspp-builds.git] / src / language / dictionary / sys-file-info.c

diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index 47d151ee23c1659f2337873059324f9dad97f9a6..ef3c0da29aef96530a77dfa4549d2fb1e5f29676 100644 (file)
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -105,7 +105,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED)
     return CMD_FAILURE;
   sfm_close_reader (reader);
 
-  t = tab_create (2, 9, 0);
+  t = tab_create (2, 10, 0);
   tab_vline (t, TAL_GAP, 1, 0, 8);
   tab_text (t, 0, 0, TAB_LEFT, _("File:"));
   tab_text (t, 1, 0, TAB_LEFT, fh_get_file_name (h));
@@ -119,25 +119,36 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED)
   tab_text (t, 0, 2, TAB_LEFT, _("Created:"));
   tab_text (t, 1, 2, TAB_LEFT | TAT_PRINTF, "%s %s by %s",
                info.creation_date, info.creation_time, info.product);
-  tab_text (t, 0, 3, TAB_LEFT, _("Endian:"));
-  tab_text (t, 1, 3, TAB_LEFT, info.big_endian ? _("Big.") : _("Little."));
-  tab_text (t, 0, 4, TAB_LEFT, _("Variables:"));
-  tab_text (t, 1, 4, TAB_LEFT | TAT_PRINTF, "%d",
+  tab_text (t, 0, 3, TAB_LEFT, _("Integer Format:"));
+  tab_text (t, 1, 3, TAB_LEFT,
+            info.integer_format == INTEGER_MSB_FIRST ? _("Big Endian.")
+            : info.integer_format == INTEGER_LSB_FIRST ? _("Little Endian.")
+            : _("Unknown."));
+  tab_text (t, 0, 4, TAB_LEFT, _("Real Format:"));
+  tab_text (t, 1, 4, TAB_LEFT,
+            info.float_format == FLOAT_IEEE_DOUBLE_LE ? _("IEEE 754 LE.")
+            : info.float_format == FLOAT_IEEE_DOUBLE_BE ? _("IEEE 754 BE.")
+            : info.float_format == FLOAT_VAX_D ? _("VAX D.")
+            : info.float_format == FLOAT_VAX_G ? _("VAX G.")
+            : info.float_format == FLOAT_Z_LONG ? _("IBM 390 Hex Long.")
+            : _("Unknown."));
+  tab_text (t, 0, 5, TAB_LEFT, _("Variables:"));
+  tab_text (t, 1, 5, TAB_LEFT | TAT_PRINTF, "%d",
                dict_get_var_cnt (d));
-  tab_text (t, 0, 5, TAB_LEFT, _("Cases:"));
-  tab_text (t, 1, 5, TAB_LEFT | TAT_PRINTF,
+  tab_text (t, 0, 6, TAB_LEFT, _("Cases:"));
+  tab_text (t, 1, 6, TAB_LEFT | TAT_PRINTF,
                info.case_cnt == -1 ? _("Unknown") : "%d", info.case_cnt);
-  tab_text (t, 0, 6, TAB_LEFT, _("Type:"));
-  tab_text (t, 1, 6, TAB_LEFT, _("System File."));
-  tab_text (t, 0, 7, TAB_LEFT, _("Weight:"));
+  tab_text (t, 0, 7, TAB_LEFT, _("Type:"));
+  tab_text (t, 1, 7, TAB_LEFT, _("System File."));
+  tab_text (t, 0, 8, TAB_LEFT, _("Weight:"));
   {
     struct variable *weight_var = dict_get_weight (d);
-    tab_text (t, 1, 7, TAB_LEFT,
+    tab_text (t, 1, 8, TAB_LEFT,
               (weight_var != NULL
                ? var_get_name (weight_var) : _("Not weighted."))); 
   }
-  tab_text (t, 0, 8, TAB_LEFT, _("Mode:"));
-  tab_text (t, 1, 8, TAB_LEFT | TAT_PRINTF,
+  tab_text (t, 0, 9, TAB_LEFT, _("Mode:"));
+  tab_text (t, 1, 9, TAB_LEFT | TAT_PRINTF,
                _("Compression %s."), info.compressed ? _("on") : _("off"));
   tab_dim (t, tab_natural_dimensions);
   tab_submit (t);