X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsys-file-writer.c;h=729213bf6826337ba2a73c2c6ae6ce7ed678d7da;hb=9389f9870643a519cf69b84a9388a0a40315d903;hp=3fed2e05445135ec2ebcc300ce23c4855d0f41df;hpb=b5c82cc9aabe7e641011130240ae1b2e84348e23;p=pspp diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c index 3fed2e0544..729213bf68 100644 --- a/src/data/sys-file-writer.c +++ b/src/data/sys-file-writer.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 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 @@ -16,8 +16,8 @@ #include -#include "sys-file-writer.h" -#include "sys-file-private.h" +#include "data/sys-file-writer.h" +#include "data/sys-file-private.h" #include #include @@ -26,32 +26,33 @@ #include #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "unlocked-io.h" -#include "xalloc.h" +#include "data/attributes.h" +#include "data/case.h" +#include "data/casewriter-provider.h" +#include "data/casewriter.h" +#include "data/dictionary.h" +#include "data/file-handle-def.h" +#include "data/file-name.h" +#include "data/format.h" +#include "data/make-file.h" +#include "data/missing-values.h" +#include "data/mrset.h" +#include "data/settings.h" +#include "data/short-names.h" +#include "data/value-labels.h" +#include "data/variable.h" +#include "libpspp/float-format.h" +#include "libpspp/i18n.h" +#include "libpspp/integer-format.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" +#include "libpspp/version.h" + +#include "gl/xmemdup0.h" +#include "gl/minmax.h" +#include "gl/unlocked-io.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -95,9 +96,9 @@ struct sfm_writer static const struct casewriter_class sys_file_casewriter_class; static void write_header (struct sfm_writer *, const struct dictionary *); -static void write_variable (struct sfm_writer *, const struct variable *, const struct dictionary *); -static void write_value_labels (struct sfm_writer *, - struct variable *, int idx, const struct dictionary *); +static void write_variable (struct sfm_writer *, const struct variable *); +static void write_value_labels (struct sfm_writer *, struct variable *, + int idx); static void write_integer_info_record (struct sfm_writer *); static void write_float_info_record (struct sfm_writer *); @@ -113,6 +114,9 @@ static void write_vls_length_table (struct sfm_writer *w, static void write_long_string_value_labels (struct sfm_writer *, const struct dictionary *); +static void write_mrsets (struct sfm_writer *, const struct dictionary *, + bool pre_v14); + static void write_variable_display_parameters (struct sfm_writer *w, const struct dictionary *dict); @@ -223,7 +227,7 @@ sfm_open_writer (struct file_handle *fh, struct dictionary *d, /* Write basic variable info. */ short_names_assign (d); for (i = 0; i < dict_get_var_cnt (d); i++) - write_variable (w, dict_get_var (d, i), d); + write_variable (w, dict_get_var (d, i)); /* Write out value labels. */ idx = 0; @@ -231,7 +235,7 @@ sfm_open_writer (struct file_handle *fh, struct dictionary *d, { struct variable *v = dict_get_var (d, i); - write_value_labels (w, v, idx, d); + write_value_labels (w, v, idx); idx += sfm_width_to_octs (var_get_width (v)); } @@ -241,6 +245,8 @@ sfm_open_writer (struct file_handle *fh, struct dictionary *d, write_integer_info_record (w); write_float_info_record (w); + write_mrsets (w, d, true); + write_variable_display_parameters (w, d); if (opts.version >= 3) @@ -254,6 +260,8 @@ sfm_open_writer (struct file_handle *fh, struct dictionary *d, write_data_file_attributes (w, d); write_variable_attributes (w, d); + write_mrsets (w, d, false); + write_encoding_record (w, d); /* Write end-of-headers record. */ @@ -421,7 +429,7 @@ write_variable_continuation_records (struct sfm_writer *w, int width) /* Write the variable record(s) for variable V to system file W. */ static void -write_variable (struct sfm_writer *w, const struct variable *v, const struct dictionary *dict) +write_variable (struct sfm_writer *w, const struct variable *v) { int width = var_get_width (v); int segment_cnt = sfm_width_to_segments (width); @@ -461,12 +469,12 @@ write_variable (struct sfm_writer *w, const struct variable *v, const struct dic /* Value label. */ if (var_has_label (v)) { - const char *label = var_get_label (v); - char *l = recode_string (dict_get_encoding (dict), UTF8, label, -1); - size_t padded_len = ROUND_UP (MIN (strlen (l), 255), 4); - write_int (w, padded_len); - write_string (w, l, padded_len); - free (l); + char *label = recode_string (var_get_encoding (v), UTF8, var_get_label (v), -1); + size_t label_len = MIN (strlen (label), 255); + size_t padded_len = ROUND_UP (label_len, 4); + write_int (w, label_len); + write_string (w, label, padded_len); + free (label); } /* Write the missing values, if any, range first. */ @@ -508,7 +516,7 @@ write_variable (struct sfm_writer *w, const struct variable *v, const struct dic Value labels for long string variables are written separately, by write_long_string_value_labels. */ static void -write_value_labels (struct sfm_writer *w, struct variable *v, int idx, const struct dictionary *dict) +write_value_labels (struct sfm_writer *w, struct variable *v, int idx) { const struct val_labs *val_labs; const struct val_lab **labels; @@ -527,7 +535,7 @@ write_value_labels (struct sfm_writer *w, struct variable *v, int idx, const str for (i = 0; i < n_labels; i++) { const struct val_lab *vl = labels[i]; - char *label = recode_string (dict_get_encoding (dict), UTF8, val_lab_get_label (vl), -1); + char *label = recode_string (var_get_encoding (v), UTF8, val_lab_get_label (vl), -1); uint8_t len = MIN (strlen (label), 255); write_value (w, val_lab_get_value (vl), var_get_width (v)); @@ -621,6 +629,64 @@ write_variable_attributes (struct sfm_writer *w, const struct dictionary *d) ds_destroy (&s); } +/* Write multiple response sets. If PRE_V14 is true, writes sets supported by + SPSS before release 14, otherwise writes sets supported only by later + versions. */ +static void +write_mrsets (struct sfm_writer *w, const struct dictionary *dict, + bool pre_v14) +{ + struct string s = DS_EMPTY_INITIALIZER; + size_t n_mrsets; + size_t i; + + n_mrsets = dict_get_n_mrsets (dict); + if (n_mrsets == 0) + return; + + for (i = 0; i < n_mrsets; i++) + { + const struct mrset *mrset = dict_get_mrset (dict, i); + const char *label; + size_t j; + + if ((mrset->type != MRSET_MD || mrset->cat_source != MRSET_COUNTEDVALUES) + != pre_v14) + continue; + + ds_put_format (&s, "%s=", mrset->name); + if (mrset->type == MRSET_MD) + { + char *counted; + + if (mrset->cat_source == MRSET_COUNTEDVALUES) + ds_put_format (&s, "E %d ", mrset->label_from_var_label ? 11 : 1); + else + ds_put_char (&s, 'D'); + + if (mrset->width == 0) + counted = xasprintf ("%.0f", mrset->counted.f); + else + counted = xmemdup0 (value_str (&mrset->counted, mrset->width), + mrset->width); + ds_put_format (&s, "%zu %s", strlen (counted), counted); + free (counted); + } + else + ds_put_char (&s, 'C'); + ds_put_char (&s, ' '); + + label = mrset->label && !mrset->label_from_var_label ? mrset->label : ""; + ds_put_format (&s, "%zu %s", strlen (label), label); + + for (j = 0; j < mrset->n_vars; j++) + ds_put_format (&s, " %s", var_get_short_name (mrset->vars[j], 0)); + ds_put_char (&s, '\n'); + } + write_attribute_record (w, &s, 7); + ds_destroy (&s); +} + /* Write the alignment, width and scale values. */ static void write_variable_display_parameters (struct sfm_writer *w, @@ -910,7 +976,7 @@ close_writer (struct sfm_writer *w) /* Seek back to the beginning and update the number of cases. This is just a courtesy to later readers, so there's no need to check return values or report errors. */ - if (ok && w->case_cnt <= INT32_MAX && !fseek (w->file, 80, SEEK_SET)) + if (ok && w->case_cnt <= INT32_MAX && !fseeko (w->file, 80, SEEK_SET)) { write_int (w, w->case_cnt); clearerr (w->file);