X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsys-file-info.c;h=3dc375213788f6b1c4d65d403596ac4276596f64;hb=4fea709b5f138c4087954b57664d5f171e02a399;hp=66ef00bb7063c988c6a4948c1049471399977da4;hpb=9420449c40bb1307f6c31e50b61ba03825680e3a;p=pspp

diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index 66ef00bb70..3dc3752137 100644
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -43,8 +43,7 @@
 #include "libpspp/pool.h"
 #include "libpspp/string-array.h"
 #include "output/pivot-table.h"
-#include "output/text-item.h"
-#include "output/table-item.h"
+#include "output/output-item.h"
 
 #include "gl/count-one-bits.h"
 #include "gl/localcharset.h"
@@ -145,7 +144,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds)
 
   if (h == NULL)
     {
-      lex_sbc_missing ("FILE");
+      lex_sbc_missing (lexer, "FILE");
       goto error;
     }
 
@@ -216,12 +215,12 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds)
              : N_("Unknown")));
 
   add_row (table, N_("Variables"),
-           pivot_value_new_integer (dict_get_var_cnt (d)));
+           pivot_value_new_integer (dict_get_n_vars (d)));
 
   add_row (table, N_("Cases"),
-           (info.case_cnt == -1
+           (info.n_cases == -1
             ? pivot_value_new_text (N_("Unknown"))
-            : pivot_value_new_integer (info.case_cnt)));
+            : pivot_value_new_integer (info.n_cases)));
 
   add_row (table, N_("Type"),
            pivot_value_new_text (info.klass->name));
@@ -241,15 +240,15 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds)
   add_row (table, N_("Encoding"),
            pivot_value_new_user_text (dict_get_encoding (d), -1));
 
-  if (dict_get_document_line_cnt (d) > 0)
+  if (dict_get_document_n_lines (d) > 0)
     add_row (table, N_("Documents"),
              pivot_value_new_user_text_nocopy (get_documents_as_string (d)));
 
   pivot_table_submit (table);
 
-  size_t n_vars = dict_get_var_cnt (d);
+  size_t n_vars = dict_get_n_vars (d);
   const struct variable **vars = xnmalloc (n_vars, sizeof *vars);
-  for (size_t i = 0; i < dict_get_var_cnt (d); i++)
+  for (size_t i = 0; i < dict_get_n_vars (d); i++)
     vars[i] = dict_get_var (d, i);
   display_variables (vars, n_vars, DF_ALL_VARIABLE);
   display_value_labels (vars, n_vars);
@@ -390,7 +389,7 @@ cmd_display (struct lexer *lexer, struct dataset *ds)
                                 vl, n, attribute_flags);
         }
       else
-        msg (SW, _("No variables to display."));
+        msg (SN, _("No variables to display."));
 
       free (vl);
     }
@@ -597,7 +596,7 @@ display_value_labels (const struct variable **vars, size_t n_vars)
             value->numeric.show = SETTINGS_VALUE_SHOW_VALUE;
           else
             value->string.show = SETTINGS_VALUE_SHOW_VALUE;
-          if (var_is_value_missing (vars[i], &vl->value, MV_USER))
+          if (var_is_value_missing (vars[i], &vl->value) == MV_USER)
             pivot_value_add_footnote (value, missing_footnote);
           int row = pivot_category_create_leaf (group, value);
 
@@ -716,10 +715,10 @@ display_attributes (const struct attrset *dict_attrset,
 static void
 display_vectors (const struct dictionary *dict, int sorted)
 {
-  size_t n_vectors = dict_get_vector_cnt (dict);
+  size_t n_vectors = dict_get_n_vectors (dict);
   if (n_vectors == 0)
     {
-      msg (SW, _("No vectors defined."));
+      msg (SN, _("No vectors defined."));
       return;
     }
 
@@ -744,7 +743,7 @@ display_vectors (const struct dictionary *dict, int sorted)
         vector_dim->root, pivot_value_new_user_text (
           vector_get_name (vectors[i]), -1));
 
-      for (size_t j = 0; j < vector_get_var_cnt (vec); j++)
+      for (size_t j = 0; j < vector_get_n_vars (vec); j++)
         {
           struct variable *var = vector_get_var (vec, j);
 
@@ -837,7 +836,7 @@ recode_strings (struct pool *pool,
           ss_rtrim (&utf8, ss_cstr (" "));
           utf8.string[utf8.length] = '\0';
 
-          if (ids[i] && !id_is_plausible (utf8.string, false))
+          if (ids[i] && !id_is_plausible (utf8.string))
             error = EINVAL;
         }
 
@@ -1003,11 +1002,12 @@ report_encodings (const struct file_handle *h, struct pool *pool,
   struct pivot_table *table = pivot_table_create__ (
     pivot_value_new_text_format (N_("Usable encodings for %s."),
                                  fh_get_name (h)), "Usable Encodings");
-  table->caption = pivot_value_new_text_format (
-    N_("Encodings that can successfully read %s (by specifying the encoding "
-       "name on the GET command's ENCODING subcommand).  Encodings that "
-       "yield identical text are listed together."),
-    fh_get_name (h));
+  pivot_table_set_caption (
+    table, pivot_value_new_text_format (
+      N_("Encodings that can successfully read %s (by specifying the encoding "
+         "name on the GET command's ENCODING subcommand).  Encodings that "
+         "yield identical text are listed together."),
+      fh_get_name (h)));
 
   pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Encodings"),
                           N_("Encodings"));
@@ -1042,9 +1042,10 @@ report_encodings (const struct file_handle *h, struct pool *pool,
     pivot_value_new_text_format (N_("%s Encoded Text Strings"),
                                  fh_get_name (h)),
     "Alternate Encoded Text Strings");
-  table->caption = pivot_value_new_text (
-    N_("Text strings in the file dictionary that the previously listed "
-       "encodings interpret differently, along with the interpretations."));
+  pivot_table_set_caption (
+    table, pivot_value_new_text (
+      N_("Text strings in the file dictionary that the previously listed "
+         "encodings interpret differently, along with the interpretations.")));
 
   pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Text"), N_("Text"));