projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sack works
[pspp]
/
src
/
data
/
csv-file-writer.c
diff --git
a/src/data/csv-file-writer.c
b/src/data/csv-file-writer.c
index 8f24bf3bfbf7d3114fa02933a50633c481d89c9b..279c63685d15c0b150862b17cc49072c6f353f7b 100644
(file)
--- a/
src/data/csv-file-writer.c
+++ b/
src/data/csv-file-writer.c
@@
-110,7
+110,7
@@
csv_writer_open (struct file_handle *fh, const struct dictionary *dict,
w->encoding = xstrdup (dict_get_encoding (dict));
w->encoding = xstrdup (dict_get_encoding (dict));
- w->n_csv_vars = dict_get_
var_cnt
(dict);
+ w->n_csv_vars = dict_get_
n_vars
(dict);
w->csv_vars = xnmalloc (w->n_csv_vars, sizeof *w->csv_vars);
for (i = 0; i < w->n_csv_vars; i++)
{
w->csv_vars = xnmalloc (w->n_csv_vars, sizeof *w->csv_vars);
for (i = 0; i < w->n_csv_vars; i++)
{
@@
-118,9
+118,9
@@
csv_writer_open (struct file_handle *fh, const struct dictionary *dict,
struct csv_var *cv = &w->csv_vars[i];
cv->width = var_get_width (var);
struct csv_var *cv = &w->csv_vars[i];
cv->width = var_get_width (var);
- cv->case_index = var_get_
case
_index (var);
+ cv->case_index = var_get_
dict
_index (var);
- cv->format =
*
var_get_print_format (var);
+ cv->format = var_get_print_format (var);
if (opts->recode_user_missing)
mv_copy (&cv->missing, var_get_missing_values (var));
else
if (opts->recode_user_missing)
mv_copy (&cv->missing, var_get_missing_values (var));
else
@@
-143,7
+143,7
@@
csv_writer_open (struct file_handle *fh, const struct dictionary *dict,
w->rf = replace_file_start (fh, "w", 0666, &w->file);
if (w->rf == NULL)
{
w->rf = replace_file_start (fh, "w", 0666, &w->file);
if (w->rf == NULL)
{
- msg (ME, _("Error opening `%s' for writing as a
system
file: %s."),
+ msg (ME, _("Error opening `%s' for writing as a
CSV
file: %s."),
fh_get_file_name (fh), strerror (errno));
goto error;
}
fh_get_file_name (fh), strerror (errno));
goto error;
}
@@
-225,7
+225,8
@@
static void
csv_output_format (struct csv_writer *w, const struct csv_var *cv,
const union value *value)
{
csv_output_format (struct csv_writer *w, const struct csv_var *cv,
const union value *value)
{
- char *s = data_out (value, w->encoding, &cv->format);
+ char *s = data_out (value, w->encoding, cv->format,
+ settings_get_fmt_settings ());
struct substring ss = ss_cstr (s);
if (cv->format.type != FMT_A)
ss_trim (&ss, ss_cstr (" "));
struct substring ss = ss_cstr (s);
if (cv->format.type != FMT_A)
ss_trim (&ss, ss_cstr (" "));
@@
-367,7
+368,7
@@
static void
csv_write_var (struct csv_writer *w, const struct csv_var *cv,
const union value *value)
{
csv_write_var (struct csv_writer *w, const struct csv_var *cv,
const union value *value)
{
- if (mv_is_value_missing (&cv->missing, value
, MV_USER)
)
+ if (mv_is_value_missing (&cv->missing, value
) == MV_USER
)
{
union value missing;
{
union value missing;