psppire-dict: Make auto_generate_var_name() public, and rename.

[pspp] / src / ui / gui / psppire-dict.c

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index d19fc809edccf68c8cde11f01f0c6dc8172030b6..1e8beac5e3f1f1023ebb7d13f763596554915dd3 100644 (file)
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2004, 2006, 2007, 2009  Free Software Foundation
+   Copyright (C) 2004, 2006, 2007, 2009, 2010, 2011, 2012  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
@@ -23,6 +23,7 @@
 #include <gtk/gtk.h>
 
 #include "data/dictionary.h"
+#include "data/identifier.h"
 #include "data/missing-values.h"
 #include "data/value-labels.h"
 #include "data/variable.h"
@@ -158,10 +159,10 @@ psppire_dict_class_init (PsppireDictClass *class)
                  G_SIGNAL_RUN_FIRST,
                  0,
                  NULL, NULL,
-                 psppire_marshal_VOID__INT_INT_INT,
+                 psppire_marshal_VOID__POINTER_INT_INT,
                  G_TYPE_NONE,
                  3,
-                 G_TYPE_INT,
+                 G_TYPE_POINTER,
                  G_TYPE_INT,
                  G_TYPE_INT);
 
@@ -247,10 +248,11 @@ addcb (struct dictionary *d, int idx, void *pd)
 }
 
 static void
-delcb (struct dictionary *d, int dict_idx, int case_idx, int width, void *pd)
+delcb (struct dictionary *d, const struct variable *var,
+       int dict_idx, int case_idx, void *pd)
 {
   g_signal_emit (pd, signals [VARIABLE_DELETED], 0,
-                 dict_idx, case_idx, width );
+                 var, dict_idx, case_idx);
 }
 
 static void
@@ -348,24 +350,31 @@ psppire_dict_replace_dictionary (PsppireDict *dict, struct dictionary *d)
 }
 
 
-/* Returns a valid name for a new variable in DICT.
-   The return value is statically allocated */
-static gchar *
-auto_generate_var_name (PsppireDict *dict)
+/* Stores a valid name for a new variable in DICT into the SIZE bytes in NAME.
+   Returns true if successful, false if SIZE is insufficient. */
+bool
+psppire_dict_generate_name (const PsppireDict *dict, char *name, size_t size)
 {
-  gint d = 0;
-  static gchar name[10];
+  gint d;
 
-  /* TRANSLATORS: This string must be a valid variable name.  That means:
-     - The string must be at most 64 bytes (not characters) long.
-     - The string may not contain whitespace.
-     - The first character may not be '$'
-     - The first character may not be a digit
-     - The final charactor may not be '.' or '_'
-   */
-  while (g_snprintf (name, 10, _("VAR%05d"), d++),
-        psppire_dict_lookup_var (dict, name))
-    ;
+  for (d = 1; ; d++)
+    {
+      int len;
+
+      /* TRANSLATORS: This string must be a valid variable name.  That means:
+         - The string must be at most 64 bytes (not characters) long.
+         - The string may not contain whitespace.
+         - The first character may not be '$'
+         - The first character may not be a digit
+         - The final charactor may not be '.' or '_'
+      */
+      len = snprintf (name, size, _("Var%04d"), d);
+      if (len + 1 >= size)
+        return false;
+
+      if (psppire_dict_lookup_var (dict, name) == NULL)
+        return true;
+    }
 
   return name;
 }
@@ -377,12 +386,19 @@ void
 psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name)
 {
   struct variable *var ;
+  char tmpname[64];
+
   g_return_if_fail (idx >= 0);
   g_return_if_fail (d);
   g_return_if_fail (PSPPIRE_IS_DICT (d));
 
   if ( ! name )
-    name = auto_generate_var_name (d);
+    {
+      if (!psppire_dict_generate_name (d, tmpname, sizeof tmpname))
+        g_return_if_reached ();
+
+      name = tmpname;
+    }
 
   d->disable_insert_signal = TRUE;
 
@@ -425,7 +441,7 @@ psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
   g_assert (d);
   g_assert (PSPPIRE_IS_DICT (d));
 
-  if ( ! var_is_valid_name (name, false))
+  if ( ! dict_id_is_valid (d->dict, name, false))
     return FALSE;
 
   if ( idx < dict_get_var_cnt (d->dict))
@@ -527,13 +543,13 @@ gboolean
 psppire_dict_check_name (const PsppireDict *dict,
                         const gchar *name, gboolean report)
 {
-  if ( ! var_is_valid_name (name, report ) )
+  if ( ! dict_id_is_valid (dict->dict, name, report ) )
     return FALSE;
 
   if (psppire_dict_lookup_var (dict, name))
     {
       if ( report )
-       msg (ME,"Duplicate variable name.");
+       msg (ME, _("Duplicate variable name."));
       return FALSE;
     }
 
@@ -835,7 +851,7 @@ gboolean
 psppire_dict_rename_var (PsppireDict *dict, struct variable *v,
                         const gchar *name)
 {
-  if ( ! var_is_valid_name (name, false))
+  if ( ! dict_id_is_valid (dict->dict, name, false))
     return FALSE;
 
   /* Make sure no other variable has this name */