projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
work on PRINT encoding
[pspp]
/
perl-module
/
PSPP.xs
diff --git
a/perl-module/PSPP.xs
b/perl-module/PSPP.xs
index a95ccf63aef6336c070af3e09fe587076a15eb2d..834ec401f483900d5cd1cb5bfb5d3e08045e7e4a 100644
(file)
--- a/
perl-module/PSPP.xs
+++ b/
perl-module/PSPP.xs
@@
-1,5
+1,5
@@
/* PSPP - computes sample statistics.
/* PSPP - computes sample statistics.
- Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009, 2010
, 2011, 2012
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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-39,9
+39,12
@@
#include <data/dictionary.h>
#include <data/case.h>
#include <data/casereader.h>
#include <data/dictionary.h>
#include <data/case.h>
#include <data/casereader.h>
+#include <data/casewriter.h>
#include <data/variable.h>
#include <data/attributes.h>
#include <data/file-handle-def.h>
#include <data/variable.h>
#include <data/attributes.h>
#include <data/file-handle-def.h>
+#include <data/identifier.h>
+#include <data/settings.h>
#include <data/sys-file-writer.h>
#include <data/sys-file-reader.h>
#include <data/value.h>
#include <data/sys-file-writer.h>
#include <data/sys-file-reader.h>
#include <data/value.h>
@@
-88,7
+91,7
@@
struct sysreader_info
/* A message handler which writes messages to PSPP::errstr */
static void
/* A message handler which writes messages to PSPP::errstr */
static void
-message_handler (const struct msg *m)
+message_handler (const struct msg *m
, void *aux
)
{
SV *errstr = get_sv("PSPP::errstr", TRUE);
sv_setpv (errstr, m->text);
{
SV *errstr = get_sv("PSPP::errstr", TRUE);
sv_setpv (errstr, m->text);
@@
-179,8
+182,8
@@
CODE:
assert (0 == strncmp (ver, bare_version, strlen (ver)));
i18n_init ();
assert (0 == strncmp (ver, bare_version, strlen (ver)));
i18n_init ();
- msg_
init (NULL, message_handler
);
- settings_init (
0, 0
);
+ msg_
set_handler (message_handler, NULL
);
+ settings_init ();
fh_init ();
SV *
fh_init ();
SV *
@@
-223,7
+226,7
@@
MODULE = PSPP PACKAGE = PSPP::Dict
struct dictionary *
pxs_dict_new()
CODE:
struct dictionary *
pxs_dict_new()
CODE:
- RETVAL = dict_create ();
+ RETVAL = dict_create (
"UTF-8"
);
OUTPUT:
RETVAL
OUTPUT:
RETVAL
@@
-255,7
+258,7
@@
set_documents (dict, docs)
struct dictionary *dict
char *docs
CODE:
struct dictionary *dict
char *docs
CODE:
- dict_set_documents (dict, docs);
+ dict_set_documents
_string
(dict, docs);
void
void
@@
-263,7
+266,7
@@
add_document (dict, doc)
struct dictionary *dict
char *doc
CODE:
struct dictionary *dict
char *doc
CODE:
- dict_add_document_line (dict, doc);
+ dict_add_document_line (dict, doc
, false
);
void
void
@@
-326,7
+329,7
@@
pxs_dict_create_var (dict, name, ip_fmt)
INIT:
SV *errstr = get_sv("PSPP::errstr", TRUE);
sv_setpv (errstr, "");
INIT:
SV *errstr = get_sv("PSPP::errstr", TRUE);
sv_setpv (errstr, "");
- if ( !
var_is_plausible_nam
e (name, false))
+ if ( !
id_is_plausibl
e (name, false))
{
sv_setpv (errstr, "The variable name is not valid.");
XSRETURN_UNDEF;
{
sv_setpv (errstr, "The variable name is not valid.");
XSRETURN_UNDEF;
@@
-376,7
+379,7
@@
set_label (var, label)
struct variable *var;
char *label
CODE:
struct variable *var;
char *label
CODE:
- var_set_label (var, label);
+ var_set_label (var, label
, false
);
void
void
@@
-592,7
+595,6
@@
CODE:
struct file_handle *fh =
fh_create_file (NULL, name, fh_default_properties () );
struct sysfile_info *sfi = xmalloc (sizeof (*sfi));
struct file_handle *fh =
fh_create_file (NULL, name, fh_default_properties () );
struct sysfile_info *sfi = xmalloc (sizeof (*sfi));
- dict_set_encoding (dict, UTF8);
sfi->writer = sfm_open_writer (fh, dict, opts);
sfi->dict = dict;
sfi->opened = true;
sfi->writer = sfm_open_writer (fh, dict, opts);
sfi->dict = dict;
sfi->opened = true;
@@
-685,7
+687,8
@@
CODE:
union value *val = case_data_rw (c, v);
value_set_missing (val, 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);
+ casewriter_write (sfi->writer, c);
+ RETVAL = 1;
finish:
free (vv);
OUTPUT:
finish:
free (vv);
OUTPUT:
@@
-706,7
+709,7
@@
CODE:
fh_create_file (NULL, name, fh_default_properties () );
sri = xmalloc (sizeof (*sri));
fh_create_file (NULL, name, fh_default_properties () );
sri = xmalloc (sizeof (*sri));
- sri->reader = sfm_open_reader (fh, &sri->dict, &sri->opts);
+ sri->reader = sfm_open_reader (fh,
NULL,
&sri->dict, &sri->opts);
if ( NULL == sri->reader)
{
if ( NULL == sri->reader)
{
@@
-727,6
+730,21
@@
CODE:
OUTPUT:
RETVAL
OUTPUT:
RETVAL
+SV *
+get_case_cnt (sfr)
+ struct sysreader_info *sfr;
+CODE:
+ SV *ret;
+ casenumber n = casereader_get_case_cnt (sfr->reader);
+ if (n == CASENUMBER_MAX)
+ ret = &PL_sv_undef;
+ else
+ ret = newSViv (n);
+ RETVAL = ret;
+ OUTPUT:
+RETVAL
+
+
void
get_next_case (sfr)
void
get_next_case (sfr)
@@
-734,7
+752,7
@@
get_next_case (sfr)
PPCODE:
struct ccase *c;
PPCODE:
struct ccase *c;
- if (
c = casereader_read (sfr->reader)
)
+ if (
(c = casereader_read (sfr->reader)) != NULL
)
{
int v;
{
int v;