X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fprint.c;h=eac5567a53a5458a4b3ddb4f61dd80b5599d8225;hp=f48be0fcfd7cd5909fe92080d90b03985e938ee0;hb=9254d30d06a0565c89daccedd93a94c4c6086004;hpb=48386ee68a5283653435d05a9ea4e449710fd370

diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c
index f48be0fc..eac5567a 100644
--- a/src/language/data-io/print.c
+++ b/src/language/data-io/print.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -25,6 +23,7 @@
 #include <data/procedure.h>
 #include <data/transformations.h>
 #include <data/variable.h>
+#include <data/format.h>
 #include <language/command.h>
 #include <language/data-io/data-writer.h>
 #include <language/data-io/file-handle.h>
@@ -32,7 +31,6 @@
 #include <language/lexer/format-parser.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/ll.h>
@@ -42,6 +40,8 @@
 #include <output/manager.h>
 #include <output/table.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -72,7 +72,7 @@ struct prt_out_spec
   };
 
 static inline struct prt_out_spec *
-ll_to_prt_out_spec (struct ll *ll) 
+ll_to_prt_out_spec (struct ll *ll)
 {
   return ll_data (ll, struct prt_out_spec, ll);
 }
@@ -83,6 +83,7 @@ struct print_trns
     struct pool *pool;          /* Stores related data. */
     bool eject;                 /* Eject page before printing? */
     bool include_prefix;        /* Prefix lines with space? */
+    const char *encoding;       /* Encoding to use for output. */
     struct dfm_writer *writer;	/* Output file, NULL=listing file. */
     struct ll_list specs;       /* List of struct prt_out_specs. */
     size_t record_cnt;          /* Number of records to write. */
@@ -91,11 +92,11 @@ struct print_trns
 
 enum which_formats
   {
-    PRINT, 
+    PRINT,
     WRITE
   };
 
-static int internal_cmd_print (struct lexer *, struct dataset *ds, 
+static int internal_cmd_print (struct lexer *, struct dataset *ds,
 			       enum which_formats, bool eject);
 static trns_proc_func print_trns_proc;
 static trns_free_func print_trns_free;
@@ -128,7 +129,7 @@ cmd_write (struct lexer *lexer, struct dataset *ds)
 
 /* Parses the output commands. */
 static int
-internal_cmd_print (struct lexer *lexer, struct dataset *ds, 
+internal_cmd_print (struct lexer *lexer, struct dataset *ds,
 		    enum which_formats which_formats, bool eject)
 {
   bool print_table = 0;
@@ -195,7 +196,10 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds,
       trns->writer = dfm_open_writer (fh);
       if (trns->writer == NULL)
         goto error;
+      trns->encoding = dfm_writer_get_legacy_encoding (trns->writer);
     }
+  else
+    trns->encoding = LEGACY_NATIVE;
 
   /* Output the variable table if requested. */
   if (print_table)
@@ -205,17 +209,19 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds,
   add_transformation (ds, print_trns_proc, print_trns_free, trns);
 
   pool_destroy (tmp_pool);
+  fh_unref (fh);
 
   return CMD_SUCCESS;
 
  error:
   print_trns_free (trns);
+  fh_unref (fh);
   return CMD_FAILURE;
 }
 
 static bool parse_string_argument (struct lexer *, struct print_trns *,
                                    int record, int *column);
-static bool parse_variable_argument (struct lexer *, const struct dictionary *, 
+static bool parse_variable_argument (struct lexer *, const struct dictionary *,
 				     struct print_trns *,
                                      struct pool *tmp_pool,
                                      int *record, int *column,
@@ -226,13 +232,13 @@ static bool parse_variable_argument (struct lexer *, const struct dictionary *,
    Returns success. */
 static bool
 parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns,
-	     struct dictionary *dict, 
+	     struct dictionary *dict,
              enum which_formats which_formats)
 {
   int record = 0;
   int column = 1;
 
-  if (lex_token (lexer) == '.') 
+  if (lex_token (lexer) == '.')
     {
       trns->record_cnt = 1;
       return true;
@@ -257,9 +263,9 @@ parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns
     }
 
   if (trns->record_cnt != 0 && trns->record_cnt != record)
-    msg (SW, _("Output calls for %d records but %u specified on RECORDS "
+    msg (SW, _("Output calls for %d records but %zu specified on RECORDS "
                "subcommand."),
-         record, (unsigned int) trns->record_cnt);
+         record, trns->record_cnt);
   trns->record_cnt = record;
 
   return true;
@@ -283,8 +289,9 @@ parse_string_argument (struct lexer *lexer, struct print_trns *trns, int record,
       int first_column, last_column;
       bool range_specified;
 
-      if (!parse_column_range (lexer, &first_column, &last_column, &range_specified)) 
-        return false; 
+      if (!parse_column_range (lexer, 1,
+                               &first_column, &last_column, &range_specified))
+        return false;
 
       spec->first_column = first_column;
       if (range_specified)
@@ -310,8 +317,8 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
   struct fmt_spec *formats, *f;
   size_t format_cnt;
   bool add_space;
-  
-  if (!parse_variables_const_pool (lexer, tmp_pool, dict, 
+
+  if (!parse_variables_const_pool (lexer, tmp_pool, dict,
 			     &vars, &var_cnt, PV_DUPLICATE))
     return false;
 
@@ -327,10 +334,10 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
       size_t i;
 
       lex_match (lexer, '*');
-      
+
       formats = pool_nmalloc (tmp_pool, var_cnt, sizeof *formats);
       format_cnt = var_cnt;
-      for (i = 0; i < var_cnt; i++) 
+      for (i = 0; i < var_cnt; i++)
         {
           const struct variable *v = vars[i];
           formats[i] = (which_formats == PRINT
@@ -362,7 +369,7 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
         /* This is a completely bizarre twist for compatibility:
            WRITE outputs the system-missing value as a field
            filled with spaces, instead of using the normal format
-           that usually contains a period. */ 
+           that usually contains a period. */
         spec->sysmis_as_spaces = (which_formats == WRITE
                                   && var_is_numeric (var)
                                   && (fmt_get_category (spec->format.type)
@@ -397,9 +404,9 @@ dump_table (struct print_trns *trns, const struct file_handle *fh)
   tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Record"));
   tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Columns"));
   tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format"));
-  tab_dim (t, tab_natural_dimensions);
+  tab_dim (t, tab_natural_dimensions, NULL);
   row = 1;
-  ll_for_each (spec, struct prt_out_spec, ll, &trns->specs) 
+  ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
     {
       char fmt_string[FMT_STRING_LEN_MAX + 1];
       int width;
@@ -443,36 +450,46 @@ static void flush_records (struct print_trns *, int target_record,
 
 /* Performs the transformation inside print_trns T on case C. */
 static int
-print_trns_proc (void *trns_, struct ccase *c, casenumber case_num UNUSED)
+print_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
 {
   struct print_trns *trns = trns_;
   bool eject = trns->eject;
+  char encoded_space = legacy_from_native (trns->encoding, ' ');
   int record = 1;
   struct prt_out_spec *spec;
 
   ds_clear (&trns->line);
   ds_put_char (&trns->line, ' ');
-  ll_for_each (spec, struct prt_out_spec, ll, &trns->specs) 
+  ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
     {
       flush_records (trns, spec->record, &eject, &record);
- 
-      ds_set_length (&trns->line, spec->first_column, ' ');
+
+      ds_set_length (&trns->line, spec->first_column, encoded_space);
       if (spec->type == PRT_VAR)
         {
-          const union value *input = case_data (c, spec->var);
+          const union value *input = case_data (*c, spec->var);
           char *output = ds_put_uninit (&trns->line, spec->format.w);
           if (!spec->sysmis_as_spaces || input->f != SYSMIS)
-            data_out (input, &spec->format, output);
+            data_out_legacy (input, trns->encoding, &spec->format, output);
           else
-            memset (output, ' ', spec->format.w);
+            memset (output, encoded_space, spec->format.w);
           if (spec->add_space)
-            ds_put_char (&trns->line, ' ');
+            ds_put_char (&trns->line, encoded_space);
+        }
+      else
+        {
+          ds_put_substring (&trns->line, ds_ss (&spec->string));
+          if (0 != strcmp (trns->encoding, LEGACY_NATIVE))
+            {
+              size_t length = ds_length (&spec->string);
+              char *data = ss_data (ds_tail (&trns->line, length));
+              legacy_recode (LEGACY_NATIVE, data,
+                             trns->encoding, data, length);
+            }
         }
-      else 
-        ds_put_substring (&trns->line, ds_ss (&spec->string));
     }
   flush_records (trns, trns->record_cnt + 1, &eject, &record);
-  
+
   if (trns->writer != NULL && dfm_write_error (trns->writer))
     return TRNS_ERROR;
   return TRNS_CONTINUE;
@@ -486,13 +503,13 @@ static void
 flush_records (struct print_trns *trns, int target_record,
                bool *eject, int *record)
 {
-  for (; target_record > *record; (*record)++) 
+  for (; target_record > *record; (*record)++)
     {
       char *line = ds_cstr (&trns->line);
       size_t length = ds_length (&trns->line);
       char leader = ' ';
-      
-      if (*eject) 
+
+      if (*eject)
         {
           *eject = false;
           if (trns->writer == NULL)
@@ -500,20 +517,20 @@ flush_records (struct print_trns *trns, int target_record,
           else
             leader = '1';
         }
-      line[0] = leader;
-      
+      line[0] = legacy_from_native (trns->encoding, leader);
+
       if (trns->writer == NULL)
         tab_output_text (TAB_FIX | TAT_NOWRAP, &line[1]);
       else
         {
-          if (!trns->include_prefix) 
+          if (!trns->include_prefix)
             {
               line++;
-              length--; 
+              length--;
             }
           dfm_put_record (trns->writer, line, length);
         }
-      
+
       ds_truncate (&trns->line, 1);
     }
 }