/* PSPP - computes sample statistics.
- Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009, 2010 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
02110-1301, USA. */
+#include <config.h>
+
+/* The Gnulib "strftime" module defines my_strftime in <config.h> for use by
+ gl/strftime.c. Perl also defines my_strftime in embed.h for some other
+ purpose. The former definition doesn't matter in this file, so suppress it
+ to avoid a compiler warning. */
+#undef my_strftime
+
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
-#include <config.h>
-
#include "ppport.h"
#include "minmax.h"
#include <libpspp/message.h>
#include <libpspp/version.h>
+#include <libpspp/i18n.h>
#include <gl/xalloc.h>
#include <data/dictionary.h>
#include <data/case.h>
MODULE = PSPP PACKAGE = PSPP
+PROTOTYPES: ENABLE
+
void
onBoot (ver)
const char *ver
CODE:
- assert (0 == strcmp (ver, bare_version));
+ /* Check that the version is correct up to the length of 'ver'.
+ This allows PSPP autobuilders to add a "-build#" suffix to the
+ PSPP version without causing failures here. */
+ assert (0 == strncmp (ver, bare_version, strlen (ver)));
+
i18n_init ();
msg_init (NULL, message_handler);
settings_init (0, 0);
CODE:
SV *ret;
const struct fmt_spec *fmt = var_get_print_format (var);
- const struct dictionary *dict = var_get_vardict (var)->dict;
union value uv;
char *s;
make_value_from_scalar (&uv, val, var);
- s = data_out (&uv, dict_get_encoding (dict), fmt);
+ s = data_out (&uv, var_get_encoding (var), fmt);
value_destroy (&uv, var_get_width (var));
ret = newSVpv (s, fmt->w);
free (s);
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;
if ( ifmt )
{
struct substring ss = ss_cstr (SvPV_nolen (sv));
- if ( ! data_in (ss, LEGACY_NATIVE, ifmt->type, 0, 0, 0,
- sfi->dict,
- case_data_rw (c, v),
- var_get_width (v)) )
+ char *error;
+ bool ok;
+
+ error = data_in (ss, SvUTF8(sv) ? UTF8: "iso-8859-1", ifmt->type,
+ case_data_rw (c, v), var_get_width (v),
+ dict_get_encoding (sfi->dict));
+ ok = error == NULL;
+ free (error);
+
+ if ( !ok )
{
RETVAL = 0;
goto finish;