X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fpor-file-writer.c;h=f17ae5c8f09fee6e7632b6f0cdeb5183ca4d1392;hb=f5c108becd49d78f4898cab11352291f5689d24e;hp=b144dee9e5dfa68ec6125fe7cca9f3f64bc8695c;hpb=3a61659a8fc11c51ad5af02b20f5613dcde50382;p=pspp-builds.git diff --git a/src/data/por-file-writer.c b/src/data/por-file-writer.c index b144dee9..f17ae5c8 100644 --- a/src/data/por-file-writer.c +++ b/src/data/por-file-writer.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -19,7 +18,7 @@ #include #include "por-file-writer.h" -#include + #include #include #include @@ -30,18 +29,23 @@ #include #include #include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include -#include "case.h" -#include "dictionary.h" -#include -#include "file-handle-def.h" #include #include +#include #include -#include "stat-macros.h" #include -#include "value-labels.h" -#include "variable.h" #include #include "gettext.h" @@ -62,12 +66,15 @@ struct pfm_writer }; /* A variable to write to the portable file. */ -struct pfm_var +struct pfm_var { int width; /* 0=numeric, otherwise string var width. */ int fv; /* Starting case index. */ }; +static struct casewriter_class por_file_casewriter_class; + +static bool close_writer (struct pfm_writer *); static void buf_write (struct pfm_writer *, const void *, size_t); static void write_header (struct pfm_writer *); static void write_version_data (struct pfm_writer *); @@ -80,7 +87,7 @@ static char *format_trig_int (int, bool force_sign, char[]); /* Returns default options for writing a portable file. */ struct pfm_write_options -pfm_writer_default_options (void) +pfm_writer_default_options (void) { struct pfm_write_options opts; opts.create_writeable = true; @@ -92,7 +99,7 @@ pfm_writer_default_options (void) /* Writes the dictionary DICT to portable file HANDLE according to the given OPTS. Returns nonzero only if successful. DICT will not be modified, except to assign short names. */ -struct pfm_writer * +struct casewriter * pfm_open_writer (struct file_handle *fh, struct dictionary *dict, struct pfm_write_options opts) { @@ -106,7 +113,7 @@ pfm_open_writer (struct file_handle *fh, struct dictionary *dict, if (opts.create_writeable) mode |= S_IWUSR | S_IWGRP | S_IWOTH; fd = open (fh_get_file_name (fh), O_WRONLY | O_CREAT | O_TRUNC, mode); - if (fd < 0) + if (fd < 0) goto open_error; /* Open file handle. */ @@ -117,28 +124,28 @@ pfm_open_writer (struct file_handle *fh, struct dictionary *dict, w = xmalloc (sizeof *w); w->fh = fh; w->file = fdopen (fd, "w"); - if (w->file == NULL) + if (w->file == NULL) { close (fd); goto open_error; } - + w->lc = 0; w->var_cnt = 0; w->vars = NULL; - + w->var_cnt = dict_get_var_cnt (dict); w->vars = xnmalloc (w->var_cnt, sizeof *w->vars); - for (i = 0; i < w->var_cnt; i++) + for (i = 0; i < w->var_cnt; i++) { const struct variable *dv = dict_get_var (dict, i); struct pfm_var *pv = &w->vars[i]; - pv->width = dv->width; - pv->fv = dv->fv; + pv->width = var_get_width (dv); + pv->fv = var_get_case_index (dv); } w->digits = opts.digits; - if (w->digits < 1) + if (w->digits < 1) { msg (ME, _("Invalid decimal digits count %d. Treating as %d."), w->digits, DBL_DIG); @@ -151,12 +158,12 @@ pfm_open_writer (struct file_handle *fh, struct dictionary *dict, write_variables (w, dict); write_value_labels (w, dict); buf_write (w, "F", 1); - if (pfm_write_error (w)) + if (ferror (w->file)) goto error; - return w; + return casewriter_create (&por_file_casewriter_class, w); error: - pfm_close_writer (w); + close_writer (w); return NULL; open_error: @@ -165,7 +172,7 @@ pfm_open_writer (struct file_handle *fh, struct dictionary *dict, fh_get_file_name (fh), strerror (errno)); goto error; } - + /* Write NBYTES starting at BUF to the portable file represented by H. Break lines properly every 80 characters. */ static void @@ -180,7 +187,7 @@ buf_write (struct pfm_writer *w, const void *buf_, size_t nbytes) while (nbytes + w->lc >= 80) { size_t n = 80 - w->lc; - + if (n) fwrite (buf, n, 1, w->file); fwrite ("\r\n", 2, 1, w->file); @@ -238,7 +245,7 @@ write_header (struct pfm_writer *w) for (i = 0; i < 5; i++) buf_write (w, "ASCII SPSS PORT FILE ", 40); - + buf_write (w, spss2ascii, 256); buf_write (w, "SPSSPORT", 8); } @@ -259,9 +266,9 @@ write_version_data (struct pfm_writer *w) tm.tm_mday = 1; tmp = &tm; } - else + else tmp = localtime (&t); - + sprintf (date_str, "%04d%02d%02d", tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday); sprintf (time_str, "%02d%02d%02d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec); @@ -280,7 +287,7 @@ write_version_data (struct pfm_writer *w) /* Write format F to file H. */ static void -write_format (struct pfm_writer *w, struct fmt_spec *f) +write_format (struct pfm_writer *w, const struct fmt_spec *f) { write_int (w, fmt_to_io (f->type)); write_int (w, f->w); @@ -291,12 +298,12 @@ write_format (struct pfm_writer *w, struct fmt_spec *f) static void write_value (struct pfm_writer *w, union value *v, struct variable *vv) { - if (vv->type == NUMERIC) + if (var_is_numeric (vv)) write_float (w, v->f); - else + else { - write_int (w, vv->width); - buf_write (w, v->s, vv->width); + write_int (w, var_get_width (vv)); + buf_write (w, v->s, var_get_width (vv)); } } @@ -307,7 +314,7 @@ write_variables (struct pfm_writer *w, struct dictionary *dict) int i; dict_assign_short_names (dict); - + buf_write (w, "4", 1); write_int (w, dict_get_var_cnt (dict)); write_int (w, 161); @@ -316,15 +323,15 @@ write_variables (struct pfm_writer *w, struct dictionary *dict) { struct variable *v = dict_get_var (dict, i); struct missing_values mv; - + buf_write (w, "7", 1); - write_int (w, v->width); - write_string (w, v->short_name); - write_format (w, &v->print); - write_format (w, &v->write); + write_int (w, var_get_width (v)); + write_string (w, var_get_short_name (v)); + write_format (w, var_get_print_format (v)); + write_format (w, var_get_write_format (v)); /* Write missing values. */ - mv_copy (&mv, &v->miss); + mv_copy (&mv, var_get_missing_values (v)); while (mv_has_range (&mv)) { double x, y; @@ -346,7 +353,7 @@ write_variables (struct pfm_writer *w, struct dictionary *dict) write_float (w, y); } } - while (mv_has_value (&mv)) + while (mv_has_value (&mv)) { union value value; mv_pop_value (&mv, &value); @@ -354,10 +361,11 @@ write_variables (struct pfm_writer *w, struct dictionary *dict) write_value (w, &value, v); } - if (v->label) - { + /* Write variable label. */ + if (var_get_label (v) != NULL) + { buf_write (w, "C", 1); - write_string (w, v->label); + write_string (w, var_get_label (v)); } } } @@ -372,18 +380,19 @@ write_value_labels (struct pfm_writer *w, const struct dictionary *dict) { struct val_labs_iterator *j; struct variable *v = dict_get_var (dict, i); + const struct val_labs *val_labs = var_get_value_labels (v); struct val_lab *vl; - if (!val_labs_count (v->val_labs)) + if (val_labs == NULL) continue; buf_write (w, "D", 1); write_int (w, 1); - write_string (w, v->short_name); - write_int (w, val_labs_count (v->val_labs)); + write_string (w, var_get_short_name (v)); + write_int (w, val_labs_count (val_labs)); - for (vl = val_labs_first_sorted (v->val_labs, &j); vl != NULL; - vl = val_labs_next (v->val_labs, &j)) + for (vl = val_labs_first_sorted (val_labs, &j); vl != NULL; + vl = val_labs_next (val_labs, &j)) { write_value (w, &vl->value, v); write_string (w, vl->label); @@ -391,41 +400,47 @@ write_value_labels (struct pfm_writer *w, const struct dictionary *dict) } } -/* Writes case ELEM to the portable file represented by H. */ -int -pfm_write_case (struct pfm_writer *w, const struct ccase *c) +/* Writes case C to the portable file represented by H. */ +static void +por_file_casewriter_write (struct casewriter *writer, void *w_, + struct ccase *c) { + struct pfm_writer *w = w_; int i; - if (ferror (w->file)) - return 0; - - for (i = 0; i < w->var_cnt; i++) + if (!ferror (w->file)) { - struct pfm_var *v = &w->vars[i]; - - if (v->width == 0) - write_float (w, case_num (c, v->fv)); - else - { - write_int (w, v->width); - buf_write (w, case_str (c, v->fv), v->width); - } + for (i = 0; i < w->var_cnt; i++) + { + struct pfm_var *v = &w->vars[i]; + + if (v->width == 0) + write_float (w, case_num_idx (c, v->fv)); + else + { + write_int (w, v->width); + buf_write (w, case_str_idx (c, v->fv), v->width); + } + } } + else + casewriter_force_error (writer); - return !pfm_write_error (w); + case_destroy (c); } -bool -pfm_write_error (const struct pfm_writer *w) +static void +por_file_casewriter_destroy (struct casewriter *writer, void *w_) { - return ferror (w->file); + struct pfm_writer *w = w_; + if (!close_writer (w)) + casewriter_force_error (writer); } /* Closes a portable file after we're done with it. Returns true if successful, false if an I/O error occurred. */ -bool -pfm_close_writer (struct pfm_writer *w) +static bool +close_writer (struct pfm_writer *w) { bool ok; @@ -439,17 +454,17 @@ pfm_close_writer (struct pfm_writer *w) memset (buf, 'Z', sizeof buf); buf_write (w, buf, w->lc >= 80 ? 80 : 80 - w->lc); - ok = !pfm_write_error (w); - if (fclose (w->file) == EOF) - ok = false; + ok = !ferror (w->file); + if (fclose (w->file) == EOF) + ok = false; - if (!ok) + if (!ok) msg (ME, _("An I/O error occurred writing portable file \"%s\"."), fh_get_file_name (w->fh)); } fh_close (w->fh, "portable file", "we"); - + free (w->vars); free (w); @@ -472,14 +487,14 @@ pfm_close_writer (struct pfm_writer *w) /* This is floor(log30(2**31)), the minimum number of trigesimal digits that a `long int' can hold. */ -#define CHUNK_SIZE 6 +#define CHUNK_SIZE 6 /* pow_tab[i] = pow (30, pow (2, i)) */ static long double pow_tab[16]; /* Initializes pow_tab[]. */ static void -init_pow_tab (void) +init_pow_tab (void) { static bool did_init = false; long double power; @@ -841,3 +856,10 @@ format_trig_double (long double value, int base_10_precision, char output[]) strcpy (output, "*."); return; } + +static struct casewriter_class por_file_casewriter_class = + { + por_file_casewriter_write, + por_file_casewriter_destroy, + NULL, + };