Fix bad syntax generation introduced by previous commit.

[pspp] / src / ui / gui / psppire-dialog-action-logistic.c

diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c
index cdf39f7836f99ba23d8e39d85502fa52e28fb816..5fb557031585ace80aed8b7e99ac1e618f6517c6 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-logistic.c
+++ b/src/ui/gui/psppire-dialog-action-logistic.c
@@ -156,38 +156,71 @@ generate_syntax (PsppireDialogAction *a)
 {
   PsppireDialogActionLogistic *rd = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
   gchar *text = NULL;
-  struct string str;
+
   const gchar *dep = gtk_entry_get_text (GTK_ENTRY (rd->dep_var));
 
-  ds_init_cstr (&str, "LOGISTIC REGRESSION ");
+  GString *strx = g_string_new ("LOGISTIC REGRESSION ");
+
+  g_string_append (strx, dep);
+
+  g_string_append (strx, " WITH");
+
+  GSList *vars = psppire_var_view_list_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0);
+  GSList *node = vars;
 
-  ds_put_cstr (&str, dep);
+  GString *var_names = g_string_new ("");
+  while (node)
+    {
+      g_string_prepend (var_names, var_get_name (node->data));
+      g_string_prepend (var_names, " ");
+      node = node->next;
+    }
 
-  ds_put_cstr (&str, " WITH ");
+  g_string_append (strx, var_names->str);
+  g_string_free (var_names, TRUE);
 
-  psppire_var_view_append_names_str (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, &str);
 
-  ds_put_cstr (&str, "\n\t/CRITERIA =");
+  GString *categoricals = g_string_new ("");
+  for (node = vars; node; node = node->next)
+    {
+      const struct variable *v = node->data;
+      enum measure m = var_get_measure (v);
+
+      if (m == MEASURE_NOMINAL || m == MEASURE_ORDINAL || var_is_alpha (v))
+       {
+         g_string_prepend (categoricals, var_get_name (v));
+         g_string_prepend (categoricals, " ");
+       }
+    }
+  if (0 != strcmp (categoricals->str, ""))
+    g_string_prepend (categoricals, "\n\t/CATEGORICAL =");
 
-  syntax_gen_pspp (&str, " CUT(%g)", rd->cut_point);
+  g_string_append (strx, categoricals->str);
+  g_string_free (categoricals, TRUE);
+  g_slist_free (vars);
 
-  syntax_gen_pspp (&str, " ITERATE(%d)", rd->max_iterations);
+  struct string opt_str;
+  ds_init_cstr (&opt_str, "\n\t/CRITERIA =");
+  syntax_gen_pspp (&opt_str, " CUT(%g)", rd->cut_point);
+  syntax_gen_pspp (&opt_str, " ITERATE(%d)", rd->max_iterations);
+  g_string_append (strx, ds_data (&opt_str));
+  ds_destroy (&opt_str);
 
   if (rd->conf)
     {
-      syntax_gen_pspp (&str, "\n\t/PRINT = CI(%g)", rd->conf_level);
+      g_string_append_printf (strx, "\n\t/PRINT = CI(%g)", rd->conf_level);
     }
 
   if (rd->constant) 
-    ds_put_cstr (&str, "\n\t/NOORIGIN");
+    g_string_append (strx, "\n\t/NOORIGIN");
   else
-    ds_put_cstr (&str, "\n\t/ORIGIN");
+    g_string_append (strx, "\n\t/ORIGIN");
 
-  ds_put_cstr (&str, ".\n");
+  g_string_append (strx, ".\n");
 
-  text = ds_steal_cstr (&str);
+  text = strx->str;
 
-  ds_destroy (&str);
+  g_string_free (strx, FALSE);
 
   return text;
 }