/* PSPP - computes sample statistics.
- Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009 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
#include <gl/xalloc.h>
#include <data/dictionary.h>
#include <data/case.h>
+#include <data/casereader.h>
#include <data/variable.h>
+#include <data/attributes.h>
#include <data/file-handle-def.h>
#include <data/sys-file-writer.h>
#include <data/sys-file-reader.h>
#include <data/value.h>
+#include <data/vardict.h>
#include <data/value-labels.h>
#include <data/format.h>
#include <data/data-in.h>
+#include <data/data-out.h>
#include <string.h>
typedef struct fmt_spec input_format ;
/* A pointer to the dictionary. Owned externally */
const struct dictionary *dict;
+
+ /* The scalar containing the dictionary */
+ SV *dict_sv;
};
{
STRLEN len;
const char *p = SvPV (scalar, len);
- memset (val->s, ' ', var_get_width (var));
- memcpy (val->s, p, len);
+ int width = var_get_width (var);
+ value_set_missing (val, width);
+ memcpy (value_str_rw (val, width), p, len);
}
}
return newSVnv (val->f);
}
else
- return newSVpvn (val->s, var_get_width (var));
+ {
+ int width = var_get_width (var);
+ return newSVpvn (value_str (val, width), width);
+ }
}
var_attach_aux (v, if_copy, var_dtor_free);
}
-static union value *
-make_value_from_scalar (SV *val, const struct variable *var)
+static void
+make_value_from_scalar (union value *uv, SV *val, const struct variable *var)
{
- union value *uv = value_create (var_get_width (var));
+ value_init (uv, var_get_width (var));
scalar_to_value (uv, val, var);
- return uv;
}
const char *ver
CODE:
assert (0 == strcmp (ver, bare_version));
+ i18n_init ();
msg_init (NULL, message_handler);
settings_init (0, 0);
fh_init ();
CODE:
SV *ret;
const struct fmt_spec *fmt = var_get_print_format (var);
- union value *uv = make_value_from_scalar (val, var);
+ const struct dictionary *dict = var_get_vardict (var)->dict;
+ union value uv;
char *s;
- s = malloc (fmt->w);
- memset (s, '\0', fmt->w);
- data_out (uv, fmt, s);
- free (uv);
+ make_value_from_scalar (&uv, val, var);
+ s = data_out (&uv, dict_get_encoding (dict), fmt);
+ value_destroy (&uv, var_get_width (var));
ret = newSVpv (s, fmt->w);
free (s);
RETVAL = ret;
OUTPUT:
RETVAL
-
+
int
value_is_missing (val, var)
SV *val
struct variable *var
CODE:
- union value *uv = make_value_from_scalar (val, var);
- int ret = var_is_value_missing (var, uv, MV_ANY);
- free (uv);
+ union value uv;
+ int ret;
+ make_value_from_scalar (&uv, val, var);
+ ret = var_is_value_missing (var, &uv, MV_ANY);
+ value_destroy (&uv, var_get_width (var));
RETVAL = ret;
OUTPUT:
RETVAL
OUTPUT:
RETVAL
+
+struct variable *
+pxs_get_var_by_name (dict, name)
+ struct dictionary *dict
+ const char *name
+INIT:
+ SV *errstr = get_sv("PSPP::errstr", TRUE);
+ sv_setpv (errstr, "");
+CODE:
+ struct variable *var = dict_lookup_var (dict, name);
+ if ( ! var )
+ sv_setpv (errstr, "No such variable.");
+ RETVAL = var;
+ OUTPUT:
+RETVAL
+
+
MODULE = PSPP PACKAGE = PSPP::Var
sv_setpv (errstr, "");
CODE:
union value the_value;
+ int width = var_get_width (var);
+ int ok;
+ value_init (&the_value, width);
if ( var_is_numeric (var))
{
if ( ! looks_like_number (key))
{
sv_setpv (errstr, "Cannot add label with string key to a numeric variable");
+ value_destroy (&the_value, width);
XSRETURN_IV (0);
}
the_value.f = SvNV (key);
}
else
{
- if ( var_is_long_string (var) )
- {
- sv_setpv (errstr, "Cannot add label to a long string variable");
- XSRETURN_IV (0);
- }
- strncpy (the_value.s, SvPV_nolen(key), MAX_SHORT_STRING);
+ value_copy_str_rpad (&the_value, width, SvPV_nolen(key), ' ');
}
- if (! var_add_value_label (var, &the_value, label) )
+ ok = var_add_value_label (var, &the_value, label);
+ value_destroy (&the_value, width);
+ if (!ok)
{
sv_setpv (errstr, "Something went wrong");
XSRETURN_IV (0);
XSRETURN_IV (1);
+SV *
+get_attributes (var)
+ struct variable *var
+CODE:
+ HV *attrhash = (HV *) sv_2mortal ((SV *) newHV());
+
+ struct attrset *as = var_get_attributes (var);
+
+ if ( as )
+ {
+ struct attrset_iterator iter;
+ struct attribute *attr;
+
+ for (attr = attrset_first (as, &iter);
+ attr;
+ attr = attrset_next (as, &iter))
+ {
+ int i;
+ const char *name = attribute_get_name (attr);
+
+ AV *values = newAV ();
+
+ for (i = 0 ; i < attribute_get_n_values (attr); ++i )
+ {
+ const char *value = attribute_get_value (attr, i);
+ av_push (values, newSVpv (value, 0));
+ }
+
+ hv_store (attrhash, name, strlen (name),
+ newRV_noinc ((SV*) values), 0);
+ }
+ }
+
+ RETVAL = newRV ((SV *) attrhash);
+ OUTPUT:
+RETVAL
+
const char *
get_name (var)
struct variable *var
CODE:
HV *labelhash = (HV *) sv_2mortal ((SV *) newHV());
- struct val_lab *vl;
+ const struct val_lab *vl;
struct val_labs_iterator *viter = NULL;
const struct val_labs *labels = var_get_value_labels (var);
if ( labels )
{
- for (vl = val_labs_first (labels, &viter);
+ for (vl = val_labs_first (labels);
vl;
- vl = val_labs_next (labels, &viter))
+ vl = val_labs_next (labels, vl))
{
SV *sv = value_to_scalar (&vl->value, var);
STRLEN len;
const char *s = SvPV (sv, len);
- hv_store (labelhash, s, len, newSVpv (vl->label, 0), 0);
+ hv_store (labelhash, s, len, newSVpv (val_lab_get_label (vl), 0), 0);
}
}
struct sysfile_info *
-pxs_create_sysfile (name, dict, opts_hr)
+pxs_create_sysfile (name, dict_ref, opts_hr)
char *name
- struct dictionary *dict
+ SV *dict_ref
SV *opts_hr
INIT:
+ SV *dict_sv = SvRV (dict_ref);
+ struct dictionary *dict = (void *) SvIV (dict_sv);
struct sfm_write_options opts;
if (!SvROK (opts_hr))
{
sfi->writer = sfm_open_writer (fh, dict, opts);
sfi->dict = dict;
sfi->opened = true;
+ sfi->dict_sv = dict_sv;
+ SvREFCNT_inc (sfi->dict_sv);
RETVAL = sfi;
OUTPUT:
struct sysfile_info *sfi
CODE:
sysfile_close (sfi);
+ SvREFCNT_dec (sfi->dict_sv);
free (sfi);
int
const struct variable **vv;
size_t nv;
- struct ccase c;
+ struct ccase *c;
SV *sv;
if ( av_len (av_case) >= dict_get_var_cnt (sfi->dict))
XSRETURN_UNDEF;
- case_create (&c, dict_get_next_value_idx (sfi->dict));
+ c = case_create (dict_get_proto (sfi->dict));
dict_get_vars (sfi->dict, &vv, &nv, 1u << DC_ORDINARY | 1u << DC_SYSTEM);
{
struct substring ss = ss_cstr (SvPV_nolen (sv));
if ( ! data_in (ss, LEGACY_NATIVE, ifmt->type, 0, 0, 0,
- case_data_rw (&c, v),
+ case_data_rw (c, v),
var_get_width (v)) )
{
RETVAL = 0;
}
else
{
- scalar_to_value (case_data_rw (&c, v), sv, v);
+ scalar_to_value (case_data_rw (c, v), sv, v);
}
}
while (i < dict_get_var_cnt (sfi->dict))
{
const struct variable *v = vv[i++];
- union value *val = case_data_rw (&c, v);
- if ( var_is_numeric (v))
- val->f = SYSMIS;
- else
- memset (val->s, ' ', var_get_width (v));
+ union value *val = case_data_rw (c, v);
+ value_set_missing (val, var_get_width (v));
}
- RETVAL = casewriter_write (sfi->writer, &c);
+ RETVAL = casewriter_write (sfi->writer, c);
finish:
-// case_destroy (&c);
free (vv);
OUTPUT:
RETVAL
RETVAL
-SV *
+void
get_next_case (sfr)
struct sysreader_info *sfr;
-CODE:
- struct ccase c;
+PPCODE:
+ struct ccase *c;
- if (! casereader_read (sfr->reader, &c))
- {
- RETVAL = 0;
- }
- else
+ if (c = casereader_read (sfr->reader))
{
int v;
- AV *av_case = (AV *) sv_2mortal ((SV *) newAV());
+ EXTEND (SP, dict_get_var_cnt (sfr->dict));
for (v = 0; v < dict_get_var_cnt (sfr->dict); ++v )
{
const struct variable *var = dict_get_var (sfr->dict, v);
- const union value *val = case_data (&c, var);
+ const union value *val = case_data (c, var);
- av_push (av_case, value_to_scalar (val, var));
+ PUSHs (sv_2mortal (value_to_scalar (val, var)));
}
- case_destroy (&c);
- RETVAL = newRV ((SV *) av_case);
+ case_unref (c);
}
-OUTPUT:
- RETVAL
-
projects / pspp-builds.git / blobdiff