projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dict: Make dict_clone_var(), dict_clone_var_assert() not rename variables.
[pspp]
/
src
/
ui
/
gui
/
text-data-import-dialog.c
diff --git
a/src/ui/gui/text-data-import-dialog.c
b/src/ui/gui/text-data-import-dialog.c
index dac8b4c1e0a5c0ad8cb22ef0887b85375eefe94b..b32573c36287072290bcc81687354efca46827fd 100644
(file)
--- a/
src/ui/gui/text-data-import-dialog.c
+++ b/
src/ui/gui/text-data-import-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009 Free Software Foundation
+ Copyright (C) 2008, 2009
, 2010
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
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
@@
-1543,6
+1543,7
@@
init_formats_page (struct import_assistant *ia)
p->data_tree_view = GTK_TREE_VIEW (get_widget_assert (builder, "data"));
p->modified_vars = NULL;
p->modified_var_cnt = 0;
p->data_tree_view = GTK_TREE_VIEW (get_widget_assert (builder, "data"));
p->modified_vars = NULL;
p->modified_var_cnt = 0;
+ p->dict = NULL;
}
/* Frees IA's formats substructure. */
}
/* Frees IA's formats substructure. */
@@
-1614,7
+1615,7
@@
prepare_formats_page (struct import_assistant *ia)
if (!dict_make_unique_var_name (dict, var_get_name (modified_var),
&number, name))
NOT_REACHED ();
if (!dict_make_unique_var_name (dict, var_get_name (modified_var),
&number, name))
NOT_REACHED ();
- dict_clone_var_assert (dict, modified_var, name);
+ dict_clone_var_as
_as
sert (dict, modified_var, name);
}
}
fmt_guesser_destroy (fg);
}
}
fmt_guesser_destroy (fg);
@@
-1748,7
+1749,9
@@
parse_field (struct import_assistant *ia,
if (field.string != NULL)
{
msg_disable ();
if (field.string != NULL)
{
msg_disable ();
+
if (!data_in (field, LEGACY_NATIVE, in->type, 0, 0, 0,
if (!data_in (field, LEGACY_NATIVE, in->type, 0, 0, 0,
+ ia->formats.dict,
&val, var_get_width (var)))
{
char fmt_string[FMT_STRING_LEN_MAX + 1];
&val, var_get_width (var)))
{
char fmt_string[FMT_STRING_LEN_MAX + 1];
@@
-1768,10
+1771,7
@@
parse_field (struct import_assistant *ia,
}
if (outputp != NULL)
{
}
if (outputp != NULL)
{
- char *output = xmalloc (out.w + 1);
- data_out (&val, &out, output);
- output[out.w] = '\0';
- *outputp = output;
+ *outputp = data_out (&val, dict_get_encoding (ia->formats.dict), &out);
}
value_destroy (&val, var_get_width (var));
}
value_destroy (&val, var_get_width (var));