X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-separators.c;h=e147881730e710e6b70472806a2430c241071efa;hb=7640d70ac1a3641869d8de331594c340c9568ea2;hp=5432e276637a45b687a41d1c7144a216edd7c99d;hpb=b0b67aa7a5225aa92bc3c9ecd1a12822f89d2c45;p=pspp

diff --git a/src/ui/gui/page-separators.c b/src/ui/gui/page-separators.c
index 5432e27663..e147881730 100644
--- a/src/ui/gui/page-separators.c
+++ b/src/ui/gui/page-separators.c
@@ -16,6 +16,8 @@
 
 #include <config.h>
 
+#include "page-separators.h"
+
 #include "ui/gui/text-data-import-dialog.h"
 
 #include <errno.h>
@@ -58,7 +60,24 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-
+/* Page where the user chooses field separators. */
+struct separators_page
+  {
+    /* How to break lines into columns. */
+    struct string separators;   /* Field separators. */
+    struct string quotes;       /* Quote characters. */
+    bool escape;                /* Doubled quotes yield a quote mark? */
+
+    GtkWidget *page;
+    GtkWidget *custom_cb;
+    GtkWidget *custom_entry;
+    GtkWidget *quote_cb;
+    GtkWidget *quote_combo;
+    GtkEntry *quote_entry;
+    GtkWidget *escape_cb;
+    GtkTreeView *fields_tree_view;
+  };
+
 /* The "separators" page of the assistant. */
 
 static void revise_fields_preview (struct import_assistant *ia);
@@ -130,17 +149,19 @@ set_quote_list (GtkComboBoxEntry *cb)
 }
 
 /* Initializes IA's separators substructure. */
-void
-init_separators_page (struct import_assistant *ia)
+
+struct separators_page *
+separators_page_create (struct import_assistant *ia)
 {
   GtkBuilder *builder = ia->asst.builder;
-  struct separators_page *p = &ia->separators;
+
   size_t i;
 
-  choose_likely_separators (ia);
+  struct separators_page *p = xzalloc (sizeof *p);
 
   p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Separators"),
                                    GTK_ASSISTANT_PAGE_CONTENT);
+
   p->custom_cb = get_widget_assert (builder, "custom-cb");
   p->custom_entry = get_widget_assert (builder, "custom-entry");
   p->quote_combo = get_widget_assert (builder, "quote-combo");
@@ -148,7 +169,6 @@ init_separators_page (struct import_assistant *ia)
   p->quote_cb = get_widget_assert (builder, "quote-cb");
   p->escape_cb = get_widget_assert (builder, "escape");
 
-  set_separators (ia);
   set_quote_list (GTK_COMBO_BOX_ENTRY (p->quote_combo));
   p->fields_tree_view = GTK_TREE_VIEW (get_widget_assert (builder, "fields"));
   g_signal_connect (p->quote_combo, "changed",
@@ -164,13 +184,15 @@ init_separators_page (struct import_assistant *ia)
                       "toggled", G_CALLBACK (on_separator_toggle), ia);
   g_signal_connect (p->escape_cb, "toggled",
                     G_CALLBACK (on_separator_toggle), ia);
+
+  return p;
 }
 
 /* Frees IA's separators substructure. */
 void
 destroy_separators_page (struct import_assistant *ia)
 {
-  struct separators_page *s = &ia->separators;
+  struct separators_page *s = ia->separators;
 
   ds_destroy (&s->separators);
   ds_destroy (&s->quotes);
@@ -199,9 +221,7 @@ reset_separators_page (struct import_assistant *ia)
 static void
 clear_fields (struct import_assistant *ia)
 {
-  struct separators_page *s = &ia->separators;
-
-  if (s->column_cnt > 0)
+  if (ia->column_cnt > 0)
     {
       struct column *col;
       size_t row;
@@ -212,7 +232,7 @@ clear_fields (struct import_assistant *ia)
           const char *line_start = ds_data (line);
           const char *line_end = ds_end (line);
 
-          for (col = s->columns; col < &s->columns[s->column_cnt]; col++)
+          for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
             {
               char *s = ss_data (col->contents[row]);
               if (!(s >= line_start && s <= line_end))
@@ -220,15 +240,15 @@ clear_fields (struct import_assistant *ia)
             }
         }
 
-      for (col = s->columns; col < &s->columns[s->column_cnt]; col++)
+      for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
         {
           free (col->name);
           free (col->contents);
         }
 
-      free (s->columns);
-      s->columns = NULL;
-      s->column_cnt = 0;
+      free (ia->columns);
+      ia->columns = NULL;
+      ia->column_cnt = 0;
     }
 }
 
@@ -237,7 +257,7 @@ clear_fields (struct import_assistant *ia)
 static void
 split_fields (struct import_assistant *ia)
 {
-  struct separators_page *s = &ia->separators;
+  struct separators_page *s = ia->separators;
   size_t columns_allocated;
   bool space_sep;
   size_t row;
@@ -297,20 +317,20 @@ split_fields (struct import_assistant *ia)
             ss_get_bytes (&text, ss_cspan (text, ds_ss (&s->separators)),
                           &field);
 
-          if (column_idx >= s->column_cnt)
+          if (column_idx >= ia->column_cnt)
             {
               struct column *column;
 
-              if (s->column_cnt >= columns_allocated)
-                s->columns = x2nrealloc (s->columns, &columns_allocated,
-                                         sizeof *s->columns);
-              column = &s->columns[s->column_cnt++];
+              if (ia->column_cnt >= columns_allocated)
+                ia->columns = x2nrealloc (ia->columns, &columns_allocated,
+                                         sizeof *ia->columns);
+              column = &ia->columns[ia->column_cnt++];
               column->name = NULL;
               column->width = 0;
               column->contents = xcalloc (ia->file.line_cnt,
                                           sizeof *column->contents);
             }
-          column = &s->columns[column_idx];
+          column = &ia->columns[column_idx];
           column->contents[row] = field;
           if (ss_length (field) > column->width)
             column->width = ss_length (field);
@@ -330,16 +350,14 @@ split_fields (struct import_assistant *ia)
 static void
 choose_column_names (struct import_assistant *ia)
 {
-  const struct first_line_page *f = &ia->first_line;
-  struct separators_page *s = &ia->separators;
   struct dictionary *dict;
   unsigned long int generated_name_count = 0;
   struct column *col;
   size_t name_row;
 
   dict = dict_create (get_default_encoding ());
-  name_row = f->variable_names && f->skip_lines ? f->skip_lines : 0;
-  for (col = s->columns; col < &s->columns[s->column_cnt]; col++)
+  name_row = ia->variable_names && ia->skip_lines ? ia->skip_lines : 0;
+  for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
     {
       char *hint, *name;
 
@@ -372,10 +390,9 @@ choose_likely_separators (struct import_assistant *ia)
         histogram[(unsigned char) line.string[i]]++;
     }
 
-  find_commonest_chars (histogram, "\"'", "", &ia->separators.quotes);
-  find_commonest_chars (histogram, ",;:/|!\t-", ",",
-                        &ia->separators.separators);
-  ia->separators.escape = true;
+  find_commonest_chars (histogram, "\"'", "", &ia->separators->quotes);
+  find_commonest_chars (histogram, ",;:/|!\t-", ",", &ia->separators->separators);
+  ia->separators->escape = true;
 }
 
 /* Chooses the most common character among those in TARGETS,
@@ -420,12 +437,12 @@ revise_fields_preview (struct import_assistant *ia)
 
   push_watch_cursor (ia);
 
-  w = GTK_WIDGET (ia->separators.fields_tree_view);
+  w = GTK_WIDGET (ia->separators->fields_tree_view);
   gtk_widget_destroy (w);
   get_separators (ia);
   split_fields (ia);
   choose_column_names (ia);
-  ia->separators.fields_tree_view = create_data_tree_view (
+  ia->separators->fields_tree_view = create_data_tree_view (
     true,
     GTK_CONTAINER (get_widget_assert (ia->asst.builder, "fields-scroller")),
     ia);
@@ -437,7 +454,7 @@ revise_fields_preview (struct import_assistant *ia)
 static void
 set_separators (struct import_assistant *ia)
 {
-  struct separators_page *s = &ia->separators;
+  struct separators_page *s = ia->separators;
   unsigned int seps;
   struct string custom;
   bool any_custom;
@@ -495,7 +512,7 @@ set_separators (struct import_assistant *ia)
 static void
 get_separators (struct import_assistant *ia)
 {
-  struct separators_page *s = &ia->separators;
+  struct separators_page *s = ia->separators;
   int i;
 
   ds_clear (&s->separators);
@@ -540,7 +557,7 @@ on_separators_custom_cb_toggle (GtkToggleButton *custom_cb,
                                 struct import_assistant *ia)
 {
   bool is_active = gtk_toggle_button_get_active (custom_cb);
-  gtk_widget_set_sensitive (ia->separators.custom_entry, is_active);
+  gtk_widget_set_sensitive (ia->separators->custom_entry, is_active);
   revise_fields_preview (ia);
 }
 
@@ -558,8 +575,8 @@ static void
 on_quote_cb_toggle (GtkToggleButton *quote_cb, struct import_assistant *ia)
 {
   bool is_active = gtk_toggle_button_get_active (quote_cb);
-  gtk_widget_set_sensitive (ia->separators.quote_combo, is_active);
-  gtk_widget_set_sensitive (ia->separators.escape_cb, is_active);
+  gtk_widget_set_sensitive (ia->separators->quote_combo, is_active);
+  gtk_widget_set_sensitive (ia->separators->escape_cb, is_active);
   revise_fields_preview (ia);
 }
 
@@ -572,3 +589,28 @@ on_separator_toggle (GtkToggleButton *toggle UNUSED,
   revise_fields_preview (ia);
 }
 
+
+
+void 
+separators_append_syntax (const struct import_assistant *ia, struct string *s)
+{
+  int i;
+  ds_put_cstr (s, "  /DELIMITERS=\"");
+  if (ds_find_byte (&ia->separators->separators, '\t') != SIZE_MAX)
+    ds_put_cstr (s, "\\t");
+  if (ds_find_byte (&ia->separators->separators, '\\') != SIZE_MAX)
+    ds_put_cstr (s, "\\\\");
+  for (i = 0; i < ds_length (&ia->separators->separators); i++)
+    {
+      char c = ds_at (&ia->separators->separators, i);
+      if (c == '"')
+	ds_put_cstr (s, "\"\"");
+      else if (c != '\t' && c != '\\')
+	ds_put_byte (s, c);
+    }
+  ds_put_cstr (s, "\"\n");
+  if (!ds_is_empty (&ia->separators->quotes))
+    syntax_gen_pspp (s, "  /QUALIFIER=%sq\n", ds_cstr (&ia->separators->quotes));
+  if (!ds_is_empty (&ia->separators->quotes) && ia->separators->escape)
+    ds_put_cstr (s, "  /ESCAPE\n");
+}