projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NPAR TESTS: Fix two test failures.
[pspp]
/
perl-module
/
PSPP.xs
diff --git
a/perl-module/PSPP.xs
b/perl-module/PSPP.xs
index 400aeda7b12ce45ada26c7dc138d8b5bf0224f4a..25effb9216b77364c9641b0a479b397cd25dea37 100644
(file)
--- a/
perl-module/PSPP.xs
+++ b/
perl-module/PSPP.xs
@@
-34,6
+34,7
@@
#include "minmax.h"
#include <libpspp/message.h>
#include <libpspp/version.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>
#include <gl/xalloc.h>
#include <data/dictionary.h>
#include <data/case.h>
@@
-591,7
+592,7
@@
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,
"UTF-8"
);
+ 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;
@@
-659,7
+660,7
@@
CODE:
char *error;
bool ok;
char *error;
bool ok;
- error = data_in (ss,
LEGACY_NATIVE
, ifmt->type,
+ 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;
case_data_rw (c, v), var_get_width (v),
dict_get_encoding (sfi->dict));
ok = error == NULL;
@@
-684,7
+685,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: