X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2FPSPP.xs;h=25effb9216b77364c9641b0a479b397cd25dea37;hb=49239dc60d3bfe5a29b6f08b176783dd72804d91;hp=bf90d986f327b811fb5f67822d7cf5c332b0c0ca;hpb=38993354cabb6fc37bb882be92f9a49e9aeb4c88;p=pspp-builds.git

diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs
index bf90d986..25effb92 100644
--- 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 <libpspp/i18n.h>
 #include <gl/xalloc.h>
 #include <data/dictionary.h>
 #include <data/case.h>
@@ -166,6 +167,8 @@ MODULE = PSPP
 
 MODULE = PSPP		PACKAGE = PSPP
 
+PROTOTYPES: ENABLE
+
 void
 onBoot (ver)
  const char *ver
@@ -589,7 +592,7 @@ CODE:
  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;
@@ -654,9 +657,16 @@ CODE:
     if ( ifmt )
       {
 	struct substring ss = ss_cstr (SvPV_nolen (sv));
-	if ( ! data_in (ss, LEGACY_NATIVE, ifmt->type, 0, 0,
- 	       	        case_data_rw (c, v), var_get_width (v),
-			dict_get_encoding (sfi->dict)))
+	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;
@@ -675,7 +685,8 @@ CODE:
    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: