#include <config.h>
+#include "page-separators.h"
+
#include "ui/gui/text-data-import-dialog.h"
#include <errno.h>
#include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
#include <gtk/gtk.h>
#include <limits.h>
#include <stdlib.h>
#include "libpspp/i18n.h"
#include "libpspp/line-reader.h"
#include "libpspp/message.h"
-#include "ui/gui/checkbox-treeview.h"
#include "ui/gui/dialog-common.h"
#include "ui/gui/executor.h"
#include "ui/gui/helper.h"
#include "ui/gui/psppire-encoding-selector.h"
#include "ui/gui/psppire-empty-list-store.h"
#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-var-store.h"
#include "ui/gui/psppire-scanf.h"
#include "ui/syntax-gen.h"
-#include "gl/error.h"
#include "gl/intprops.h"
#include "gl/xalloc.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-\f
+/* 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;
+ PsppSheetView *fields_tree_view;
+ };
+
/* The "separators" page of the assistant. */
static void revise_fields_preview (struct import_assistant *ia);
}
/* 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");
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"));
+ p->fields_tree_view = PSPP_SHEET_VIEW (get_widget_assert (builder, "fields"));
g_signal_connect (p->quote_combo, "changed",
G_CALLBACK (on_quote_combo_change), ia);
g_signal_connect (p->quote_cb, "toggled",
"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. */
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;
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))
}
}
- 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;
}
}
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);
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;
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");
+}
projects / pspp / blobdiff