-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2006 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>
+
#include "sys-file-writer.h"
-#include "sfm-private.h"
-#include <libpspp/message.h>
-#include <stdlib.h>
+#include "sys-file-private.h"
+
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
+#include <stdlib.h>
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
+
#include <libpspp/alloc.h>
-#include "case.h"
-#include "dictionary.h"
-#include <libpspp/message.h>
-#include "file-handle-def.h"
#include <libpspp/hash.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
-#include "settings.h"
-#include "stat-macros.h"
#include <libpspp/str.h>
-#include "value-labels.h"
-#include "variable.h"
#include <libpspp/version.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/format.h>
+#include <data/missing-values.h>
+#include <data/settings.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+
+#include "minmax.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#include <libpspp/debug-print.h>
+/* Find 64-bit floating-point type. */
+#if SIZEOF_FLOAT == 8
+ #define flt64 float
+ #define FLT64_MAX FLT_MAX
+#elif SIZEOF_DOUBLE == 8
+ #define flt64 double
+ #define FLT64_MAX DBL_MAX
+#elif SIZEOF_LONG_DOUBLE == 8
+ #define flt64 long double
+ #define FLT64_MAX LDBL_MAX
+#else
+ #error Which one of your basic types is 64-bit floating point?
+#endif
+
+/* Figure out SYSMIS value for flt64. */
+#include <libpspp/magic.h>
+#if SIZEOF_DOUBLE == 8
+#define second_lowest_flt64 second_lowest_value
+#else
+#error Must define second_lowest_flt64 for your architecture.
+#endif
+
+/* Record Type 1: General Information. */
+struct sysfile_header
+ {
+ char rec_type[4] ; /* 00: Record-type code, "$FL2". */
+ char prod_name[60] ; /* 04: Product identification. */
+ int32_t layout_code ; /* 40: 2. */
+ int32_t nominal_case_size ; /* 44: Number of `value's per case.
+ Note: some systems set this to -1 */
+ int32_t compress ; /* 48: 1=compressed, 0=not compressed. */
+ int32_t weight_idx ; /* 4c: 1-based index of weighting var, or 0. */
+ int32_t case_cnt ; /* 50: Number of cases, -1 if unknown. */
+ flt64 bias ; /* 54: Compression bias (100.0). */
+ char creation_date[9] ; /* 5c: `dd mmm yy' creation date of file. */
+ char creation_time[8] ; /* 65: `hh:mm:ss' 24-hour creation time. */
+ char file_label[64] ; /* 6d: File label. */
+ char padding[3] ; /* ad: Ignored padding. */
+ } ATTRIBUTE((packed)) ;
+
+/* Record Type 2: Variable. */
+struct sysfile_variable
+ {
+ int32_t rec_type ; /* 2. */
+ int32_t type ; /* 0=numeric, 1-255=string width,
+ -1=continued string. */
+ int32_t has_var_label ; /* 1=has a variable label, 0=doesn't. */
+ int32_t n_missing_values ; /* Missing value code of -3,-2,0,1,2, or 3. */
+ int32_t print ; /* Print format. */
+ int32_t write ; /* Write format. */
+ char name[SHORT_NAME_LEN] ; /* Variable name. */
+ /* The rest of the structure varies. */
+ } ATTRIBUTE((packed)) ;
/* Compression bias used by PSPP. Values between (1 -
COMPRESSION_BIAS) and (251 - COMPRESSION_BIAS) inclusive can be
int compress; /* 1=compressed, 0=not compressed. */
int case_cnt; /* Number of cases written so far. */
size_t flt64_cnt; /* Number of flt64 elements in case. */
+ bool has_vls; /* Does the dict have very long strings? */
/* Compression buffering. */
flt64 *buf; /* Buffered data. */
/* Variables. */
struct sfm_var *vars; /* Variables. */
size_t var_cnt; /* Number of variables. */
+ size_t var_cnt_vls; /* Number of variables including
+ very long string components. */
};
/* A variable in a system file. */
-struct sfm_var
+struct sfm_var
{
int width; /* 0=numeric, otherwise string width. */
int fv; /* Index into case. */
size_t flt64_cnt; /* Number of flt64 elements. */
};
+static struct casewriter_class sys_file_casewriter_class;
+
static char *append_string_max (char *, const char *, const char *);
static void write_header (struct sfm_writer *, const struct dictionary *);
static void buf_write (struct sfm_writer *, const void *, size_t);
-static void write_variable (struct sfm_writer *, struct variable *);
+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_rec_7_34 (struct sfm_writer *);
-static void write_longvar_table (struct sfm_writer *w,
+static void write_longvar_table (struct sfm_writer *w,
const struct dictionary *dict);
-static void write_variable_display_parameters (struct sfm_writer *w,
+static void write_vls_length_table (struct sfm_writer *w,
+ const struct dictionary *dict);
+
+
+static void write_variable_display_parameters (struct sfm_writer *w,
const struct dictionary *dict);
static void write_documents (struct sfm_writer *, const struct dictionary *);
-static int does_dict_need_translation (const struct dictionary *);
+
+bool write_error (const struct sfm_writer *);
+bool close_writer (struct sfm_writer *);
static inline int
-var_flt64_cnt (const struct variable *v)
+var_flt64_cnt (const struct variable *v)
{
- return v->type == NUMERIC ? 1 : DIV_RND_UP (v->width, sizeof (flt64));
+ assert(sizeof(flt64) == MAX_SHORT_STRING);
+ return sfm_width_to_bytes(var_get_width (v)) / MAX_SHORT_STRING ;
}
+static inline int
+var_flt64_cnt_nom (const struct variable *v)
+{
+ return (var_is_numeric (v)
+ ? 1 : DIV_RND_UP (var_get_width (v), sizeof (flt64)));
+}
+
+
/* Returns default options for writing a system file. */
struct sfm_write_options
-sfm_writer_default_options (void)
+sfm_writer_default_options (void)
{
struct sfm_write_options opts;
opts.create_writeable = true;
return opts;
}
+
+/* Return a short variable name to be used as the continuation of the
+ variable with the short name SN.
+
+ FIXME: Need to resolve clashes somehow.
+
+ */
+static const char *
+cont_var_name(const char *sn, int idx)
+{
+ static char s[SHORT_NAME_LEN + 1];
+
+ char abb[SHORT_NAME_LEN + 1 - 3]= {0};
+
+ strncpy(abb, sn, SHORT_NAME_LEN - 3);
+
+ snprintf(s, SHORT_NAME_LEN + 1, "%s%03d", abb, idx);
+
+ return s;
+}
+
+
/* Opens the system file designated by file handle FH for writing
cases from dictionary D according to the given OPTS. If
COMPRESS is nonzero, the system file will be compressed.
No reference to D is retained, so it may be modified or
destroyed at will after this function returns. D is not
modified by this function, except to assign short names. */
-struct sfm_writer *
+struct casewriter *
sfm_open_writer (struct file_handle *fh, struct dictionary *d,
struct sfm_write_options opts)
{
int i;
/* Check version. */
- if (opts.version != 2 && opts.version != 3)
+ if (opts.version != 2 && opts.version != 3)
{
msg (ME, _("Unknown system file version %d. Treating as version %d."),
opts.version, 3);
mode = S_IRUSR | S_IRGRP | S_IROTH;
if (opts.create_writeable)
mode |= S_IWUSR | S_IWGRP | S_IWOTH;
- fd = open (fh_get_filename (fh), O_WRONLY | O_CREAT | O_TRUNC, mode);
- if (fd < 0)
+ fd = open (fh_get_file_name (fh), O_WRONLY | O_CREAT | O_TRUNC, mode);
+ if (fd < 0)
goto open_error;
/* Open file handle. */
w->fh = fh;
w->file = fdopen (fd, "w");
- w->needs_translation = does_dict_need_translation (d);
+ w->needs_translation = dict_compacting_would_change (d);
w->compress = opts.compress;
w->case_cnt = 0;
w->flt64_cnt = 0;
+ w->has_vls = false;
w->buf = w->end = w->ptr = NULL;
w->x = w->y = NULL;
w->var_cnt = dict_get_var_cnt (d);
+ w->var_cnt_vls = w->var_cnt;
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 (d, i);
struct sfm_var *sv = &w->vars[i];
- sv->width = dv->width;
- sv->fv = dv->fv;
+ sv->width = var_get_width (dv);
+ /* spss compatibility nonsense */
+ if ( var_get_width (dv) >= MIN_VERY_LONG_STRING )
+ w->has_vls = true;
+
+ sv->fv = var_get_case_index (dv);
sv->flt64_cnt = var_flt64_cnt (dv);
}
/* Check that file create succeeded. */
- if (w->file == NULL)
+ if (w->file == NULL)
{
close (fd);
goto open_error;
/* Write basic variable info. */
dict_assign_short_names (d);
for (i = 0; i < dict_get_var_cnt (d); i++)
- write_variable (w, dict_get_var (d, i));
+ {
+ int count = 0;
+ const struct variable *v = dict_get_var(d, i);
+ int wcount = var_get_width (v);
+
+ do {
+ struct variable *var_cont = var_clone (v);
+ var_set_short_name (var_cont, var_get_short_name (v));
+ if ( var_is_alpha (v))
+ {
+ if ( 0 != count )
+ {
+ var_clear_missing_values (var_cont);
+ var_set_short_name (var_cont,
+ cont_var_name (var_get_short_name (v),
+ count));
+ var_clear_label (var_cont);
+ w->var_cnt_vls++;
+ }
+ count++;
+ if ( wcount >= MIN_VERY_LONG_STRING )
+ {
+ var_set_width (var_cont, MIN_VERY_LONG_STRING - 1);
+ wcount -= EFFECTIVE_LONG_STRING_LENGTH;
+ }
+ else
+ {
+ var_set_width (var_cont, wcount);
+ wcount -= var_get_width (var_cont);
+ }
+ }
+
+ write_variable (w, var_cont);
+ var_destroy (var_cont);
+ } while(wcount > 0);
+ }
/* Write out value labels. */
for (idx = i = 0; i < dict_get_var_cnt (d); i++)
write_variable_display_parameters (w, d);
- if (opts.version >= 3)
+ if (opts.version >= 3)
write_longvar_table (w, d);
+ write_vls_length_table(w, d);
+
/* Write end-of-headers record. */
{
struct
{
- int32_t rec_type P;
- int32_t filler P;
- }
+ int32_t rec_type ;
+ int32_t filler ;
+ } ATTRIBUTE((packed))
rec_999;
rec_999.rec_type = 999;
buf_write (w, &rec_999, sizeof rec_999);
}
- if (w->compress)
+ if (w->compress)
{
w->buf = xnmalloc (128, sizeof *w->buf);
w->ptr = w->buf;
w->y = (unsigned char *) w->ptr;
}
- if (sfm_write_error (w))
+ if (write_error (w))
goto error;
-
- return w;
+
+ return casewriter_create (&sys_file_casewriter_class, w);
error:
- sfm_close_writer (w);
+ close_writer (w);
return NULL;
open_error:
msg (ME, _("Error opening \"%s\" for writing as a system file: %s."),
- fh_get_filename (fh), strerror (errno));
+ fh_get_file_name (fh), strerror (errno));
goto error;
}
-static int
-does_dict_need_translation (const struct dictionary *d)
-{
- size_t case_idx;
- size_t i;
-
- case_idx = 0;
- for (i = 0; i < dict_get_var_cnt (d); i++)
- {
- struct variable *v = dict_get_var (d, i);
- if (v->fv != case_idx)
- return 0;
- case_idx += v->nv;
- }
- return 1;
-}
-
/* Returns value of X truncated to two least-significant digits. */
static int
rerange (int x)
w->flt64_cnt = 0;
for (i = 0; i < dict_get_var_cnt (d); i++)
- w->flt64_cnt += var_flt64_cnt (dict_get_var (d, i));
- hdr.case_size = w->flt64_cnt;
+ {
+ w->flt64_cnt += var_flt64_cnt (dict_get_var (d, i));
+ }
+ hdr.nominal_case_size = w->flt64_cnt;
hdr.compress = w->compress;
if (dict_get_weight (d) != NULL)
{
- struct variable *weight_var;
+ const struct variable *weight_var;
int recalc_weight_idx = 1;
int i;
weight_var = dict_get_weight (d);
- for (i = 0; ; i++)
+ for (i = 0; ; i++)
{
struct variable *v = dict_get_var (d, i);
if (v == weight_var)
sprintf (buf, "%02d:%02d:%02d", hour - 1, min - 1, sec - 1);
memcpy (hdr.creation_time, buf, sizeof hdr.creation_time);
}
-
+
{
const char *label = dict_get_label (d);
if (label == NULL)
label = "";
- buf_copy_str_rpad (hdr.file_label, sizeof hdr.file_label, label);
+ buf_copy_str_rpad (hdr.file_label, sizeof hdr.file_label, label);
}
-
+
memset (hdr.padding, 0, sizeof hdr.padding);
buf_write (w, &hdr, sizeof hdr);
/* Translates format spec from internal form in SRC to system file
format in DEST. */
static inline void
-write_format_spec (struct fmt_spec *src, int32_t *dest)
+write_format_spec (const struct fmt_spec *src, int32_t *dest)
{
- *dest = (formats[src->type].spss << 16) | (src->w << 8) | src->d;
+ assert (fmt_check_output (src));
+ *dest = (fmt_to_io (src->type) << 16) | (src->w << 8) | src->d;
}
/* Write the variable record(s) for primary variable P and secondary
variable S to system file W. */
static void
-write_variable (struct sfm_writer *w, struct variable *v)
+write_variable (struct sfm_writer *w, const struct variable *v)
{
struct sysfile_variable sv;
struct missing_values mv;
flt64 m[3]; /* Missing value values. */
int nm; /* Number of missing values, possibly negative. */
+ const char *label = var_get_label (v);
sv.rec_type = 2;
- sv.type = v->width;
- sv.has_var_label = (v->label != NULL);
+ sv.type = MIN (var_get_width (v), MIN_VERY_LONG_STRING - 1);
+ sv.has_var_label = label != NULL;
- mv_copy (&mv, &v->miss);
+ mv_copy (&mv, var_get_missing_values (v));
nm = 0;
- if (mv_has_range (&mv))
+ if (mv_has_range (&mv))
{
double x, y;
mv_pop_range (&mv, &x, &y);
{
union value value;
mv_pop_value (&mv, &value);
- if (v->type == NUMERIC)
+ if (var_is_numeric (v))
m[nm] = value.f;
else
- buf_copy_rpad ((char *) &m[nm], sizeof m[nm], value.s, v->width);
+ buf_copy_rpad ((char *) &m[nm], sizeof m[nm], value.s,
+ var_get_width (v));
nm++;
}
- if (mv_has_range (&v->miss))
+ if (mv_has_range (var_get_missing_values (v)))
nm = -nm;
sv.n_missing_values = nm;
- write_format_spec (&v->print, &sv.print);
- write_format_spec (&v->write, &sv.write);
- buf_copy_str_rpad (sv.name, sizeof sv.name, v->short_name);
+ write_format_spec (var_get_print_format (v), &sv.print);
+ write_format_spec (var_get_write_format (v), &sv.write);
+ buf_copy_str_rpad (sv.name, sizeof sv.name, var_get_short_name (v));
buf_write (w, &sv, sizeof sv);
- if (v->label)
+ if (label != NULL)
{
struct label
{
- int32_t label_len P;
- char label[255] P;
- }
+ int32_t label_len ;
+ char label[255] ;
+ } ATTRIBUTE((packed))
l;
int ext_len;
- l.label_len = min (strlen (v->label), 255);
+ l.label_len = MIN (strlen (label), 255);
ext_len = ROUND_UP (l.label_len, sizeof l.label_len);
- memcpy (l.label, v->label, l.label_len);
+ memcpy (l.label, label, l.label_len);
memset (&l.label[l.label_len], ' ', ext_len - l.label_len);
buf_write (w, &l, offsetof (struct label, label) + ext_len);
if (nm)
buf_write (w, m, sizeof *m * abs (nm));
- if (v->type == ALPHA && v->width > (int) sizeof (flt64))
+ if (var_is_alpha (v) && var_get_width (v) > (int) sizeof (flt64))
{
int i;
int pad_count;
memset (&sv.write, 0, sizeof sv.write);
memset (&sv.name, 0, sizeof sv.name);
- pad_count = DIV_RND_UP (v->width, (int) sizeof (flt64)) - 1;
+ pad_count = DIV_RND_UP (MIN(var_get_width (v), MIN_VERY_LONG_STRING - 1),
+ (int) sizeof (flt64)) - 1;
for (i = 0; i < pad_count; i++)
buf_write (w, &sv, sizeof sv);
}
{
struct value_label_rec
{
- int32_t rec_type P;
- int32_t n_labels P;
- flt64 labels[1] P;
- };
+ int32_t rec_type ;
+ int32_t n_labels ;
+ flt64 labels[1] ;
+ } ATTRIBUTE((packed));
struct var_idx_rec
{
- int32_t rec_type P;
- int32_t n_vars P;
- int32_t vars[1] P;
- };
+ int32_t rec_type ;
+ int32_t n_vars ;
+ int32_t vars[1] ;
+ } ATTRIBUTE((packed));
+ const struct val_labs *val_labs;
struct val_labs_iterator *i;
struct value_label_rec *vlr;
struct var_idx_rec vir;
size_t vlr_size;
flt64 *loc;
- if (!val_labs_count (v->val_labs))
+ val_labs = var_get_value_labels (v);
+ if (val_labs == NULL)
return;
/* Pass 1: Count bytes. */
vlr_size = (sizeof (struct value_label_rec)
- + sizeof (flt64) * (val_labs_count (v->val_labs) - 1));
- for (vl = val_labs_first (v->val_labs, &i); vl != NULL;
- vl = val_labs_next (v->val_labs, &i))
+ + sizeof (flt64) * (val_labs_count (val_labs) - 1));
+ for (vl = val_labs_first (val_labs, &i); vl != NULL;
+ vl = val_labs_next (val_labs, &i))
vlr_size += ROUND_UP (strlen (vl->label) + 1, sizeof (flt64));
/* Pass 2: Copy bytes. */
vlr = xmalloc (vlr_size);
vlr->rec_type = 3;
- vlr->n_labels = val_labs_count (v->val_labs);
+ vlr->n_labels = val_labs_count (val_labs);
loc = vlr->labels;
- for (vl = val_labs_first_sorted (v->val_labs, &i); vl != NULL;
- vl = val_labs_next (v->val_labs, &i))
+ for (vl = val_labs_first_sorted (val_labs, &i); vl != NULL;
+ vl = val_labs_next (val_labs, &i))
{
size_t len = strlen (vl->label);
REM_RND_UP (len + 1, sizeof (flt64)));
loc += DIV_RND_UP (len + 1, sizeof (flt64));
}
-
+
buf_write (w, vlr, vlr_size);
free (vlr);
write_documents (struct sfm_writer *w, const struct dictionary *d)
{
struct
- {
- int32_t rec_type P; /* Always 6. */
- int32_t n_lines P; /* Number of lines of documents. */
- }
- rec_6;
+ {
+ int32_t rec_type ; /* Always 6. */
+ int32_t n_lines ; /* Number of lines of documents. */
+ } ATTRIBUTE((packed)) rec_6;
- const char *documents;
- size_t n_lines;
+ const char * documents = dict_get_documents (d);
+ size_t doc_bytes = strlen (documents);
- documents = dict_get_documents (d);
- n_lines = strlen (documents) / 80;
+ assert (doc_bytes % 80 == 0);
rec_6.rec_type = 6;
- rec_6.n_lines = n_lines;
+ rec_6.n_lines = doc_bytes / 80;
buf_write (w, &rec_6, sizeof rec_6);
- buf_write (w, documents, 80 * n_lines);
+ buf_write (w, documents, 80 * rec_6.n_lines);
}
/* Write the alignment, width and scale values */
static void
-write_variable_display_parameters (struct sfm_writer *w,
+write_variable_display_parameters (struct sfm_writer *w,
const struct dictionary *dict)
{
int i;
struct
{
- int32_t rec_type P;
- int32_t subtype P;
- int32_t elem_size P;
- int32_t n_elem P;
- } vdp_hdr;
+ int32_t rec_type ;
+ int32_t subtype ;
+ int32_t elem_size ;
+ int32_t n_elem ;
+ } ATTRIBUTE((packed)) vdp_hdr;
vdp_hdr.rec_type = 7;
vdp_hdr.subtype = 11;
vdp_hdr.elem_size = 4;
- vdp_hdr.n_elem = w->var_cnt * 3;
+ vdp_hdr.n_elem = w->var_cnt_vls * 3;
buf_write (w, &vdp_hdr, sizeof vdp_hdr);
- for ( i = 0 ; i < w->var_cnt ; ++i )
+ for ( i = 0 ; i < w->var_cnt ; ++i )
{
struct variable *v;
struct
{
- int32_t measure P;
- int32_t width P;
- int32_t align P;
- }
- params;
+ int32_t measure ;
+ int32_t width ;
+ int32_t align ;
+ } ATTRIBUTE((packed)) params;
v = dict_get_var(dict, i);
- params.measure = v->measure;
- params.width = v->display_width;
- params.align = v->alignment;
-
+ params.measure = (var_get_measure (v) == MEASURE_NOMINAL ? 1
+ : var_get_measure (v) == MEASURE_ORDINAL ? 2
+ : 3);
+ params.width = var_get_display_width (v);
+ params.align = (var_get_alignment (v) == ALIGN_LEFT ? 0
+ : var_get_alignment (v) == ALIGN_RIGHT ? 1
+ : 2);
+
buf_write (w, ¶ms, sizeof(params));
+
+ if (var_is_long_string (v))
+ {
+ int wcount = var_get_width (v) - EFFECTIVE_LONG_STRING_LENGTH ;
+
+ while (wcount > 0)
+ {
+ params.width = wcount >= MIN_VERY_LONG_STRING ? 32 : wcount;
+
+ buf_write (w, ¶ms, sizeof(params));
+
+ wcount -= EFFECTIVE_LONG_STRING_LENGTH ;
+ }
+ }
}
}
+/* Writes the table of lengths for Very Long String Variables */
+static void
+write_vls_length_table (struct sfm_writer *w,
+ const struct dictionary *dict)
+{
+ int i;
+ struct
+ {
+ int32_t rec_type ;
+ int32_t subtype ;
+ int32_t elem_size ;
+ int32_t n_elem ;
+ } ATTRIBUTE((packed)) vls_hdr;
+
+ struct string vls_length_map;
+
+ ds_init_empty (&vls_length_map);
+
+ vls_hdr.rec_type = 7;
+ vls_hdr.subtype = 14;
+ vls_hdr.elem_size = 1;
+
+
+ for (i = 0; i < dict_get_var_cnt (dict); ++i)
+ {
+ const struct variable *v = dict_get_var (dict, i);
+
+ if ( var_get_width (v) < MIN_VERY_LONG_STRING )
+ continue;
+
+ ds_put_format (&vls_length_map, "%s=%05d",
+ var_get_short_name (v), var_get_width (v));
+ ds_put_char (&vls_length_map, '\0');
+ ds_put_char (&vls_length_map, '\t');
+ }
+
+ vls_hdr.n_elem = ds_length (&vls_length_map);
+
+ if ( vls_hdr.n_elem > 0 )
+ {
+ buf_write (w, &vls_hdr, sizeof vls_hdr);
+ buf_write (w, ds_data (&vls_length_map), ds_length (&vls_length_map));
+ }
+
+ ds_destroy (&vls_length_map);
+}
+
/* Writes the long variable name table */
static void
write_longvar_table (struct sfm_writer *w, const struct dictionary *dict)
{
struct
{
- int32_t rec_type P;
- int32_t subtype P;
- int32_t elem_size P;
- int32_t n_elem P;
- }
- lv_hdr;
+ int32_t rec_type ;
+ int32_t subtype ;
+ int32_t elem_size ;
+ int32_t n_elem ;
+ } ATTRIBUTE((packed)) lv_hdr;
struct string long_name_map;
size_t i;
- ds_init (&long_name_map, 10 * dict_get_var_cnt (dict));
+ ds_init_empty (&long_name_map);
for (i = 0; i < dict_get_var_cnt (dict); i++)
{
struct variable *v = dict_get_var (dict, i);
-
+
if (i)
- ds_putc (&long_name_map, '\t');
- ds_printf (&long_name_map, "%s=%s", v->short_name, v->name);
+ ds_put_char (&long_name_map, '\t');
+ ds_put_format (&long_name_map, "%s=%s",
+ var_get_short_name (v), var_get_name (v));
}
lv_hdr.rec_type = 7;
{
struct
{
- int32_t rec_type_3 P;
- int32_t subtype_3 P;
- int32_t data_type_3 P;
- int32_t n_elem_3 P;
- int32_t elem_3[8] P;
- int32_t rec_type_4 P;
- int32_t subtype_4 P;
- int32_t data_type_4 P;
- int32_t n_elem_4 P;
- flt64 elem_4[3] P;
- }
- rec_7;
+ int32_t rec_type_3 ;
+ int32_t subtype_3 ;
+ int32_t data_type_3 ;
+ int32_t n_elem_3 ;
+ int32_t elem_3[8] ;
+ int32_t rec_type_4 ;
+ int32_t subtype_4 ;
+ int32_t data_type_4 ;
+ int32_t n_elem_4 ;
+ flt64 elem_4[3] ;
+ } ATTRIBUTE((packed)) rec_7;
/* Components of the version number, from major to minor. */
int version_component[3];
-
+
/* Used to step through the version string. */
char *p;
version_component[1] = strtol (bare_version, &p, 10);
version_component[2] = (isalpha ((unsigned char) *p)
? tolower ((unsigned char) *p) - 'a' : 0);
-
+
rec_7.rec_type_3 = 7;
rec_7.subtype_3 = 3;
rec_7.data_type_3 = sizeof (int32_t);
static char *
append_string_max (char *dest, const char *src, const char *end)
{
- int nbytes = min (end - dest, (int) strlen (src));
+ int nbytes = MIN (end - dest, (int) strlen (src));
memcpy (dest, src, nbytes);
return dest + nbytes;
}
static void write_compressed_data (struct sfm_writer *w, const flt64 *elem);
-/* Writes case C to system file W.
- Returns 1 if successful, 0 if an I/O error occurred. */
-int
-sfm_write_case (struct sfm_writer *w, const struct ccase *c)
+/* Writes case C to system file W. */
+static void
+sys_file_casewriter_write (struct casewriter *writer, void *w_,
+ struct ccase *c)
{
+ struct sfm_writer *w = w_;
if (ferror (w->file))
- return 0;
-
+ {
+ casewriter_force_error (writer);
+ case_destroy (c);
+ return;
+ }
+
w->case_cnt++;
if (!w->needs_translation && !w->compress
- && sizeof (flt64) == sizeof (union value))
+ && sizeof (flt64) == sizeof (union value) && ! w->has_vls )
{
/* Fast path: external and internal representations are the
same and the dictionary is properly ordered. Write
directly to file. */
buf_write (w, case_data_all (c), sizeof (union value) * w->flt64_cnt);
}
- else
+ else
{
/* Slow path: internal and external representations differ.
Write into a bounce buffer, then write to W. */
flt64 *bounce;
flt64 *bounce_cur;
+ flt64 *bounce_end;
size_t bounce_size;
size_t i;
bounce_size = sizeof *bounce * w->flt64_cnt;
bounce = bounce_cur = local_alloc (bounce_size);
+ bounce_end = bounce + bounce_size;
- for (i = 0; i < w->var_cnt; i++)
+ for (i = 0; i < w->var_cnt; i++)
{
struct sfm_var *v = &w->vars[i];
- if (v->width == 0)
- *bounce_cur = case_num (c, v->fv);
- else
- memcpy (bounce_cur, case_data (c, v->fv)->s, v->width);
- bounce_cur += v->flt64_cnt;
+ memset(bounce_cur, ' ', v->flt64_cnt * sizeof (flt64));
+
+ if (v->width == 0)
+ {
+ *bounce_cur = case_num_idx (c, v->fv);
+ bounce_cur += v->flt64_cnt;
+ }
+ else
+ { int ofs = 0;
+ while (ofs < v->width)
+ {
+ int chunk = MIN (MIN_VERY_LONG_STRING - 1, v->width - ofs);
+ int nv = DIV_RND_UP (chunk, sizeof (flt64));
+ buf_copy_rpad ((char *) bounce_cur, nv * sizeof (flt64),
+ case_data_idx (c, v->fv)->s + ofs, chunk);
+ bounce_cur += nv;
+ ofs += chunk;
+ }
+ }
+
}
if (!w->compress)
else
write_compressed_data (w, bounce);
- local_free (bounce);
+ local_free (bounce);
}
-
- return !sfm_write_error (w);
+
+ case_destroy (c);
+}
+
+static void
+sys_file_casewriter_destroy (struct casewriter *writer, void *w_)
+{
+ struct sfm_writer *w = w_;
+ if (!close_writer (w))
+ casewriter_force_error (writer);
}
static void
-put_instruction (struct sfm_writer *w, unsigned char instruction)
+put_instruction (struct sfm_writer *w, unsigned char instruction)
{
if (w->x >= w->y)
{
}
static void
-put_element (struct sfm_writer *w, const flt64 *elem)
+put_element (struct sfm_writer *w, const flt64 *elem)
{
ensure_buf_space (w);
memcpy (w->ptr++, elem, sizeof *elem);
}
static void
-write_compressed_data (struct sfm_writer *w, const flt64 *elem)
+write_compressed_data (struct sfm_writer *w, const flt64 *elem)
{
size_t i;
{
struct sfm_var *v = &w->vars[i];
- if (v->width == 0)
+ if (v->width == 0)
{
if (*elem == -FLT64_MAX)
put_instruction (w, 255);
else if (*elem >= 1 - COMPRESSION_BIAS
&& *elem <= 251 - COMPRESSION_BIAS
- && *elem == (int) *elem)
+ && *elem == (int) *elem)
put_instruction (w, (int) *elem + COMPRESSION_BIAS);
else
{
}
elem++;
}
- else
+ else
{
size_t j;
-
- for (j = 0; j < v->flt64_cnt; j++, elem++)
+
+ for (j = 0; j < v->flt64_cnt; j++, elem++)
{
if (!memcmp (elem, " ", sizeof (flt64)))
put_instruction (w, 254);
- else
+ else
{
put_instruction (w, 253);
put_element (w, elem);
/* Returns true if an I/O error has occurred on WRITER, false otherwise. */
bool
-sfm_write_error (const struct sfm_writer *writer)
+write_error (const struct sfm_writer *writer)
{
return ferror (writer->file);
}
/* Closes a system file after we're done with it.
Returns true if successful, false if an I/O error occurred. */
bool
-sfm_close_writer (struct sfm_writer *w)
+close_writer (struct sfm_writer *w)
{
bool ok;
-
+
if (w == NULL)
return true;
ok = true;
- if (w->file != NULL)
+ if (w->file != NULL)
{
/* Flush buffer. */
if (w->buf != NULL && w->ptr > w->buf)
}
fflush (w->file);
- ok = !sfm_write_error (w);
+ ok = !write_error (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
if (!ok)
msg (ME, _("An I/O error occurred writing system file \"%s\"."),
- fh_get_filename (w->fh));
+ fh_get_file_name (w->fh));
}
fh_close (w->fh, "system file", "we");
-
+
free (w->buf);
free (w->vars);
free (w);
return ok;
}
+\f
+static struct casewriter_class sys_file_casewriter_class =
+ {
+ sys_file_casewriter_write,
+ sys_file_casewriter_destroy,
+ NULL,
+ };
projects / pspp-builds.git / blobdiff