+#include <config.h>
#include "helper.h"
#include <data/data-in.h>
+#include <data/data-out.h>
#include <libpspp/message.h>
+#include <libpspp/i18n.h>
+
#include <ctype.h>
#include <string.h>
+#include <data/settings.h>
/* Formats a value according to FORMAT
The returned string must be freed when no longer required */
gchar *s = 0;
s = g_new(gchar, format.w + 1);
- if ( ! data_out(s, &format, &v) )
- {
- g_warning("Can't format missing discrete value \n");
- }
+ data_out(&v, &format, s);
s[format.w]='\0';
g_strchug(s);
text_to_value(const gchar *text, union value *v,
struct fmt_spec format)
{
- struct data_in di;
+ bool ok;
if ( format.type != FMT_A)
{
}
}
- di.s = text;
- di.e = text + strlen(text);
- di.v = v;
- di.flags = DI_IGNORE_ERROR;
- di.f1 = di.f2 = 0;
- di.format = format;
-
- return data_in(&di);
+ msg_disable ();
+ ok = data_in (ss_cstr (text), format.type, 0, 0,
+ v, fmt_var_width (&format));
+ msg_enable ();
+ return ok;
}
}
/* Converts a string in the pspp locale to utf-8 */
-const char *
+char *
pspp_locale_to_utf8(const gchar *text, gssize len, GError **err)
{
- GError *tmp_error = 0;
-
- const gchar *s;
-
- if ( ! text )
- return 0;
-
- s = g_locale_to_utf8(text, len, 0, 0, &tmp_error);
-
- if ( tmp_error)
- {
- g_warning("Error converting to UTF8: %s", tmp_error->message);
- g_propagate_error (err, tmp_error);
- }
-
- return s;
+ return recode_string(CONV_PSPP_TO_UTF8, text, len);
}