projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix broken expose callback in pspp-sheet-view
[pspp]
/
src
/
data
/
por-file-writer.c
diff --git
a/src/data/por-file-writer.c
b/src/data/por-file-writer.c
index ee84e7c9c29aec8c44096d70aa64b790c21e5d6c..1cd6c6ed7a085eb83c1035c5eb8ecf9c819895d8 100644
(file)
--- a/
src/data/por-file-writer.c
+++ b/
src/data/por-file-writer.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011
, 2012, 2013
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
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
@@
-336,7
+336,9
@@
write_variables (struct pfm_writer *w, struct dictionary *dict)
buf_write (w, "4", 1);
write_int (w, dict_get_var_cnt (dict));
buf_write (w, "4", 1);
write_int (w, dict_get_var_cnt (dict));
- write_int (w, 161);
+
+ buf_write (w, "5", 1);
+ write_int (w, ceil (w->digits * (log (10) / log (30))));
for (i = 0; i < dict_get_var_cnt (dict); i++)
{
for (i = 0; i < dict_get_var_cnt (dict); i++)
{
@@
-404,6
+406,7
@@
write_value_labels (struct pfm_writer *w, const struct dictionary *dict)
const struct val_labs *val_labs = var_get_value_labels (v);
size_t n_labels = val_labs_count (val_labs);
const struct val_lab **labels;
const struct val_labs *val_labs = var_get_value_labels (v);
size_t n_labels = val_labs_count (val_labs);
const struct val_lab **labels;
+ int j;
if (n_labels == 0)
continue;
if (n_labels == 0)
continue;
@@
-415,11
+418,11
@@
write_value_labels (struct pfm_writer *w, const struct dictionary *dict)
n_labels = val_labs_count (val_labs);
labels = val_labs_sorted (val_labs);
n_labels = val_labs_count (val_labs);
labels = val_labs_sorted (val_labs);
- for (
i = 0; i < n_labels; i
++)
+ for (
j = 0; j < n_labels; j
++)
{
{
- const struct val_lab *vl = labels[
i
];
+ const struct val_lab *vl = labels[
j
];
write_value (w, val_lab_get_value (vl), var_get_width (v));
write_value (w, val_lab_get_value (vl), var_get_width (v));
- write_string (w, val_lab_get_label (vl));
+ write_string (w, val_lab_get_
escaped_
label (vl));
}
free (labels);
}
}
free (labels);
}
@@
-436,10
+439,7
@@
write_documents (struct pfm_writer *w, const struct dictionary *dict)
buf_write (w, "E", 1);
write_int (w, line_cnt);
for (i = 0; i < line_cnt; i++)
buf_write (w, "E", 1);
write_int (w, line_cnt);
for (i = 0; i < line_cnt; i++)
- {
- dict_get_document_line (dict, i, &line);
- write_string (w, ds_cstr (&line));
- }
+ write_string (w, dict_get_document_line (dict, i));
ds_destroy (&line);
}
ds_destroy (&line);
}