/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
02110-1301, USA. */
#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 <libpspp/version.h>
+
+#include "case.h"
+#include "dictionary.h"
+#include "file-handle-def.h"
+#include "format.h"
+#include "missing-values.h"
+#include "settings.h"
#include "value-labels.h"
#include "variable.h"
-#include <libpspp/version.h>
-#include <minmax.h>
+
+#include "stat-macros.h"
+#include "minmax.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
var_flt64_cnt (const struct variable *v)
{
assert(sizeof(flt64) == MAX_SHORT_STRING);
- return width_to_bytes(v->width) / 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 v->type == NUMERIC ? 1 : DIV_RND_UP (v->width, sizeof (flt64));
+ return (var_is_numeric (v)
+ ? 1 : DIV_RND_UP (var_get_width (v), sizeof (flt64)));
}
{
const struct variable *dv = dict_get_var (d, i);
struct sfm_var *sv = &w->vars[i];
- sv->width = dv->width;
+ sv->width = var_get_width (dv);
/* spss compatibility nonsense */
- if ( dv->width > MAX_LONG_STRING )
+ if ( var_get_width (dv) >= MIN_VERY_LONG_STRING )
w->has_vls = true;
- sv->fv = dv->fv;
+ sv->fv = var_get_case_index (dv);
sv->flt64_cnt = var_flt64_cnt (dv);
}
{
int count = 0;
const struct variable *v = dict_get_var(d, i);
- int wcount = v->width;
+ int wcount = var_get_width (v);
do {
- struct variable var_cont = *v;
- if ( v->type == ALPHA)
+ 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 )
{
- mv_init(&var_cont.miss, 0);
- strcpy(var_cont.short_name,
- cont_var_name(v->short_name, count));
- var_cont.label = NULL;
+ 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 > MAX_LONG_STRING )
+ if ( wcount >= MIN_VERY_LONG_STRING )
{
- var_cont.width = MAX_LONG_STRING;
+ var_set_width (var_cont, MIN_VERY_LONG_STRING - 1);
wcount -= EFFECTIVE_LONG_STRING_LENGTH;
}
else
{
- var_cont.width = wcount;
- wcount -= var_cont.width;
+ var_set_width (var_cont, wcount);
+ wcount -= var_get_width (var_cont);
}
-
- var_cont.write.w = var_cont.width;
- var_cont.print.w = var_cont.width;
}
- write_variable (w, &var_cont);
+ write_variable (w, var_cont);
+ var_destroy (var_cont);
} while(wcount > 0);
}
static inline void
write_format_spec (const struct fmt_spec *src, int32_t *dest)
{
- assert(check_output_specifier(src, true));
- *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
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 = min(v->width, MAX_LONG_STRING);
- 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))
{
{
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
{
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 (min(v->width, MAX_LONG_STRING),
+ 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);
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);
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);
+ params.width = var_get_display_width (v);
+ params.align = var_get_alignment (v);
buf_write (w, ¶ms, sizeof(params));
- if ( v->width > MAX_LONG_STRING )
+ if (var_is_long_string (v))
{
- int wcount = v->width - EFFECTIVE_LONG_STRING_LENGTH ;
+ int wcount = var_get_width (v) - EFFECTIVE_LONG_STRING_LENGTH ;
while (wcount > 0)
{
- params.width = wcount > MAX_LONG_STRING ? 32 : wcount;
+ params.width = wcount >= MIN_VERY_LONG_STRING ? 32 : wcount;
buf_write (w, ¶ms, sizeof(params));
{
const struct variable *v = dict_get_var (dict, i);
- if ( v->width <= MAX_LONG_STRING )
+ if ( var_get_width (v) < MIN_VERY_LONG_STRING )
continue;
- ds_put_format (&vls_length_map, "%s=%05d", v->short_name, v->width);
+ 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');
}
if (i)
ds_put_char (&long_name_map, '\t');
- ds_put_format (&long_name_map, "%s=%s", v->short_name, v->name);
+ ds_put_format (&long_name_map, "%s=%s",
+ var_get_short_name (v), var_get_name (v));
}
lv_hdr.rec_type = 7;
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;
}
if (v->width == 0)
{
- *bounce_cur = case_num (c, v->fv);
+ *bounce_cur = case_num_idx (c, v->fv);
bounce_cur += v->flt64_cnt;
}
else
{ int ofs = 0;
while (ofs < v->width)
{
- int chunk = MIN (MAX_LONG_STRING, v->width - ofs);
+ 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 (c, v->fv)->s + ofs, chunk);
+ case_data_idx (c, v->fv)->s + ofs, chunk);
bounce_cur += nv;
ofs += chunk;
}