You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
#include <config.h>
#include <errno.h>
#include "data/ods-reader.h"
#include "data/spreadsheet-reader.h"
#include "data/value-labels.h"
+#include "data/casereader-provider.h"
#include "gl/intprops.h"
static GObjectClass * parent_class = NULL;
-static void destroy_columns (PsppireImportAssistant *ia);
-
static void
psppire_import_assistant_finalize (GObject *object)
{
if (ia->spreadsheet)
spreadsheet_unref (ia->spreadsheet);
- // destroy_columns (ia);
-
- ds_destroy (&ia->separators);
ds_destroy (&ia->quotes);
g_object_unref (ia->builder);
{
push_watch_cursor (ia);
- get_separators (ia);
+ // get_separators (ia);
// split_fields (ia);
choose_column_names (ia);
pop_watch_cursor (ia);
}
+
+#if SHEET_MERGE
+
/* Chooses the most common character among those in TARGETS,
based on the frequency data in HISTOGRAM, and stores it in
RESULT. If there is a tie for the most common character among
find_commonest_chars (histogram, ",;:/|!\t-", ",", &ia->separators);
}
+#endif
static void set_separators (PsppireImportAssistant *ia);
repopulate_delimiter_columns (ia);
revise_fields_preview (ia);
- choose_likely_separators (ia);
- set_separators (ia);
+ // choose_likely_separators (ia);
+ // set_separators (ia);
}
struct separator
#define SEPARATOR_CNT (sizeof separators / sizeof *separators)
+#if SHEET_MERGE
/* Sets the widgets to match IA's separators substructure. */
static void
gtk_widget_set_sensitive (ia->quote_combo, any_quotes);
}
+#endif
/* Resets IA's intro page to its initial state. */
static void
static void
on_map (PsppireImportAssistant *ia, GtkWidget *page)
{
+#if TEXT_FILE
GtkFileChooser *fc = GTK_FILE_CHOOSER (page);
-#if TEXT_FILE
if (ia->file_name)
gtk_file_chooser_set_filename (fc, ia->file_name);
#endif
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
int n;
- PsppireTextFile *tf = PSPPIRE_TEXT_FILE (model);
GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
gint *index = gtk_tree_path_get_indices (path);
psppire_import_assistant_new (GtkWindow *toplevel)
{
return GTK_WIDGET (g_object_new (PSPPIRE_TYPE_IMPORT_ASSISTANT,
- "transient-for", toplevel,
+ /* Some window managers (notably ratpoison)
+ ignore the maximise command when a window is
+ transient. This causes problems for this
+ window. */
+ /* "transient-for", toplevel, */
NULL));
}
#if SHEET_MERGE
-static void
-destroy_columns (PsppireImportAssistant *ia)
-{
- struct column *col;
- for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
- {
- free (col->name);
- free (col->contents);
- }
-
- free (ia->columns);
-}
-
-
-
/* Called to render one of the cells in the fields preview tree
view. */
static void
bool ok;
struct substring field = ia->columns[column].contents[row];
- struct variable *var = dict_get_var (ia->dict, column);
+ const struct variable *var = dict_get_var (ia->dict, column);
union value val;
value_init (&val, var_get_width (var));
}
-
+#if SHEET_MERGE
/* Sets IA's separators substructure to match the widgets. */
static void
-#if SHEET_MERGE
+
/* Breaks the file data in IA into columns based on the
separators set in IA's separators substructure. */
#endif
+static struct casereader_random_class my_casereader_class;
+
+static struct ccase *
+my_read (struct casereader *reader, void *aux, casenumber idx)
+{
+ PsppireImportAssistant *ia = PSPPIRE_IMPORT_ASSISTANT (aux);
+ GtkTreeModel *tm = GTK_TREE_MODEL (ia->delimiters_model);
+
+ GtkTreePath *tp = gtk_tree_path_new_from_indices (idx, -1);
+
+ const struct caseproto *proto = casereader_get_proto (reader);
+
+ GtkTreeIter iter;
+ struct ccase *c = NULL;
+ if (gtk_tree_model_get_iter (tm, &iter, tp))
+ {
+ c = case_create (proto);
+ int i;
+ for (i = 0 ; i < caseproto_get_n_widths (proto); ++i)
+ {
+ GValue value = {0};
+ gtk_tree_model_get_value (tm, &iter, i + 1, &value);
+
+ const struct variable *var = dict_get_var (ia->dict, i);
+
+ const gchar *ss = g_value_get_string (&value);
+
+ union value *v = case_data_rw (c, var);
+ char *xx = data_in (ss_cstr (ss),
+ "UTF-8",
+ var_get_write_format (var)->type,
+ v, var_get_width (var), "UTF-8");
+
+ /* if (xx) */
+ /* g_print ("%s:%d Err %s\n", __FILE__, __LINE__, xx); */
+ free (xx);
+ g_value_unset (&value);
+ }
+ }
+
+ gtk_tree_path_free (tp);
+
+ return c;
+}
+
+static void
+my_destroy (struct casereader *reader, void *aux)
+{
+ g_print ("%s:%d %p\n", __FILE__, __LINE__, reader);
+}
+
+static void
+my_advance (struct casereader *reader, void *aux, casenumber cnt)
+{
+ g_print ("%s:%d\n", __FILE__, __LINE__);
+}
+
+
+static void
+foo (struct dictionary *dict, void *aux)
+{
+ PsppireImportAssistant *ia = PSPPIRE_IMPORT_ASSISTANT (aux);
+ g_print ("%s:%d\n", __FILE__, __LINE__);
+
+ struct caseproto *proto = caseproto_create ();
+
+ int i;
+ for (i = 0 ; i < dict_get_var_cnt (ia->dict); ++i)
+ {
+ const struct variable *var = dict_get_var (ia->dict, i);
+ proto = caseproto_add_width (proto, var_get_width (var));
+ }
+
+
+ gint n_rows = gtk_tree_model_iter_n_children (ia->delimiters_model, NULL);
+
+ struct casereader *reader =
+ casereader_create_random (proto, n_rows, &my_casereader_class, ia);
+
+
+ PsppireDataStore *store = NULL;
+
+ g_object_get (ia->data_sheet, "data-model", &store, NULL);
+
+ psppire_data_store_set_reader (store, reader);
+}
+
/* Called just before the formats page of the assistant is
displayed. */
static void
PsppireDict *dict = psppire_dict_new_from_dict (ia->dict);
g_object_set (ia->var_sheet, "data-model", dict, NULL);
+ my_casereader_class.read = my_read;
+ my_casereader_class.destroy = my_destroy;
+ my_casereader_class.advance = my_advance;
+
+ struct caseproto *proto = caseproto_create ();
+ int i;
+
+ struct fmt_guesser **fg = xcalloc (sizeof *fg, dict_get_var_cnt (ia->dict));
+ for (i = 0 ; i < dict_get_var_cnt (ia->dict); ++i)
+ {
+ fg[i] = fmt_guesser_create ();
+ }
+
+ gint n_rows = gtk_tree_model_iter_n_children (ia->delimiters_model, NULL);
+
+ GtkTreeIter iter;
+ gboolean ok;
+ for (ok = gtk_tree_model_get_iter_first (ia->delimiters_model, &iter);
+ ok;
+ ok = gtk_tree_model_iter_next (ia->delimiters_model, &iter))
+ {
+ for (i = 0 ; i < dict_get_var_cnt (ia->dict); ++i)
+ {
+ gchar *s = NULL;
+ gtk_tree_model_get (ia->delimiters_model, &iter, i+1, &s, -1);
+ fmt_guesser_add (fg[i], ss_cstr (s));
+ free (s);
+ }
+ }
+
+ for (i = 0 ; i < dict_get_var_cnt (ia->dict); ++i)
+ {
+ struct fmt_spec fs;
+ fmt_guesser_guess (fg[i], &fs);
+
+ fmt_fix (&fs, FMT_FOR_INPUT);
+
+ struct variable *var = dict_get_var (ia->dict, i);
+
+ int width = fmt_var_width (&fs);
+
+ var_set_width_and_formats (var, width,
+ &fs, &fs);
+
+ proto = caseproto_add_width (proto, width);
+ fmt_guesser_destroy (fg[i]);
+ }
+
+ free (fg);
+
+ // dict_set_change_callback (ia->dict, foo, ia);
+
+ struct casereader *reader =
+ casereader_create_random (proto, n_rows, &my_casereader_class, ia);
+
PsppireDataStore *store = psppire_data_store_new (dict);
+ psppire_data_store_set_reader (store, reader);
+
g_object_set (ia->data_sheet, "data-model", store, NULL);
+
+ gint pmax;
+ g_object_get (get_widget_assert (ia->builder, "vpaned1"),
+ "max-position", &pmax, NULL);
+
+
+ g_object_set (get_widget_assert (ia->builder, "vpaned1"),
+ "position", pmax / 2, NULL);
+
gtk_widget_show (ia->paste_button);
}
add_page_to_assistant (ia, w,
GTK_ASSISTANT_PAGE_CONFIRM, _("Adjust Variable Formats"));
- ia->data_tree_view = NULL;
ia->modified_vars = NULL;
ia->modified_var_cnt = 0;
}
separators_append_syntax (const PsppireImportAssistant *ia, struct string *s)
{
int i;
+
ds_put_cstr (s, " /DELIMITERS=\"");
- if (ds_find_byte (&ia->separators, '\t') != SIZE_MAX)
+
+ if (gtk_toggle_button_get_active (get_widget_assert (ia->builder, "tab")))
ds_put_cstr (s, "\\t");
- if (ds_find_byte (&ia->separators, '\\') != SIZE_MAX)
- ds_put_cstr (s, "\\\\");
- for (i = 0; i < ds_length (&ia->separators); i++)
+ for (i = 0; i < SEPARATOR_CNT; i++)
{
- char c = ds_at (&ia->separators, i);
- if (c == '"')
- ds_put_cstr (s, "\"\"");
- else if (c != '\t' && c != '\\')
- ds_put_byte (s, c);
+ const struct separator *seps = &separators[i];
+ GtkWidget *button = get_widget_assert (ia->builder, seps->name);
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
+ {
+ if (seps->c == '\t')
+ continue;
+
+ ds_put_byte (s, seps->c);
+ }
}
ds_put_cstr (s, "\"\n");
if (!ds_is_empty (&ia->quotes))
syntax_gen_pspp (s, " /QUALIFIER=%sq\n", ds_cstr (&ia->quotes));
}
-
static void
formats_append_syntax (const PsppireImportAssistant *ia, struct string *s)
{
projects / pspp / blobdiff