X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=7fc951d3cdeff0a7252bc3cb4de5f1a1ae79effe;hb=e339b2ca72d77a076566856e9357781d49cd983c;hp=30f7da1f04cc6209bb4dd2517e6fad8721f089c9;hpb=d46430e7458fcd65dfdf7928f52f2d06fa60127d;p=pspp

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 30f7da1f04..7fc951d3cd 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009, 2010, 2011, 2012  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011, 2012, 2013  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -47,6 +47,26 @@
 
 #include <gettext.h>
 
+/* Returns a copy of IN with each underscore doubled.  The caller should free
+   the returned string (with free()) when it is no longer needed. */
+char *
+escape_underscores (const char *in)
+{
+  char *out = xmalloc (2 * strlen (in) + 1);
+  char *p;
+
+  p = out;
+  for (; *in != '\0'; in++)
+    {
+      if (*in == '_')
+        *p++ = '_';
+      *p++ = *in;
+    }
+  *p = '\0';
+
+  return out;
+}
+
 /* Formats a value according to VAR's print format and strips white space
    appropriately for VAR's type.  That is, if VAR is numeric, strips leading
    white space (because numbers are right-justified within their fields), and
@@ -57,11 +77,27 @@
    longer required. */
 gchar *
 value_to_text (union value v, const struct variable *var)
+{
+  return value_to_text__ (v, var_get_print_format (var),
+                          var_get_encoding (var));
+}
+
+/* Formats a value with format FORMAT and strips white space appropriately for
+   FORMATs' type.  That is, if FORMAT is numeric, strips leading white space
+   (because numbers are right-justified within their fields), and if FORMAT is
+   string, strips trailing white space (because spaces pad out string values on
+   the right).
+
+   Returns an allocated string.  The returned string must be freed when no
+   longer required. */
+gchar *
+value_to_text__ (union value v,
+                 const struct fmt_spec *format, const char *encoding)
 {
   gchar *s;
 
-  s = data_out (&v, var_get_encoding (var), var_get_print_format (var));
-  if (var_is_numeric (var))
+  s = data_out_stretchy (&v, encoding, format, NULL);
+  if (fmt_is_numeric (format->type))
     g_strchug (s);
   else
     g_strchomp (s);
@@ -69,7 +105,6 @@ value_to_text (union value v, const struct variable *var)
   return s;
 }
 
-
 /* Converts TEXT to a value.
 
    VAL will be initialised and filled by this function.
@@ -83,8 +118,25 @@ text_to_value (const gchar *text,
 	       const struct variable *var,
 	       union value *val)
 {
-  const struct fmt_spec *format = var_get_print_format (var);
-  int width = var_get_width (var);
+  return text_to_value__ (text, var_get_print_format (var),
+                          var_get_encoding (var), val);
+}
+
+/* Converts TEXT, which contains a value in the given FORMAT encoding in
+   ENCODING, into a value.
+
+   VAL will be initialised and filled by this function.
+   It is the caller's responsibility to destroy VAL when no longer needed.
+
+   On success, VAL is returned, NULL otherwise.
+*/
+union value *
+text_to_value__ (const gchar *text,
+                 const struct fmt_spec *format,
+                 const gchar *encoding,
+                 union value *val)
+{
+  int width = fmt_var_width (format);
 
   if ( format->type != FMT_A)
     {
@@ -104,8 +156,7 @@ text_to_value (const gchar *text,
     }
 
   value_init (val, width);
-  free (data_in (ss_cstr (text), UTF8, format->type, val, width,
-                 var_get_encoding (var)));
+  free (data_in (ss_cstr (text), UTF8, format->type, val, width, encoding));
 
   return val;
 }