Aggregate Dialog: Convert from old fashioned method to PsppireDialogAction paradigm

[pspp] / src / ui / gui / helper.c

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 04c9bfe92039b0fd8dacf7653d39a26495494855..d453f2a66593e79548e95e7a8d5b62d478a821d5 100644 (file)
--- 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
@@ -40,13 +40,32 @@
 #include <data/settings.h>
 
 #include "psppire-data-store.h"
-#include "psppire.h"
 
 #include "gl/configmake.h"
 #include "xalloc.h"
 
 #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
@@ -76,7 +95,7 @@ value_to_text__ (union value v,
 {
   gchar *s;
 
-  s = data_out (&v, encoding, format);
+  s = data_out_stretchy (&v, encoding, format, NULL);
   if (fmt_is_numeric (format->type))
     g_strchug (s);
   else
@@ -98,8 +117,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)
     {
@@ -119,8 +155,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;
 }