pspp-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[sheet prep 5/6] gui: Strip numerics and strings differently in value_to


From: Ben Pfaff
Subject: [sheet prep 5/6] gui: Strip numerics and strings differently in value_to_text().
Date: Wed, 22 Jun 2011 20:33:14 -0700

Otherwise a long string value that only contains a few
characters followed by all spaces is hard to read.
---
 src/ui/gui/helper.c |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index f5803d9..09bfe7a 100644
--- 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;
 }
 
 
-- 
1.7.2.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]