gui: Strip numerics and strings differently in value_to_text().

[pspp-builds.git] / src / ui / gui / helper.c

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index f5803d9f244fe88413a15ff55161b75f45a6bf35..09bfe7acae61d81e285ab9762a1b58a93c4c1a8b 100644 (file)
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -47,13 +47,26 @@
 
 #include <gettext.h>
 
-/* Formats a value according to VAR's print format.
-   The returned string must be freed when no longer required. */
+/* 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
+   if VAR 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 variable *var)
 {
-  gchar *s = data_out (&v, var_get_encoding (var), var_get_print_format (var));
-  return g_strchug (s);
+  gchar *s;
+
+  s = data_out (&v, var_get_encoding (var), var_get_print_format (var));
+  if (var_is_numeric (var))
+    g_strchug (s);
+  else
+    g_strchomp (s);
+
+  return s;
 }