#include "value-variant.h"
-static void psppire_data_store_init (PsppireDataStore *data_store);
-static void psppire_data_store_class_init (PsppireDataStoreClass *class);
-
static void psppire_data_store_finalize (GObject *object);
static void psppire_data_store_dispose (GObject *object);
union value val;
value_init (&val, width);
- char *xx =
- data_in (ss_cstr (in), psppire_dict_encoding (store->dict),
- fmt->type, &val, width, "UTF-8");
+ const struct val_labs *value_labels = var_get_value_labels (variable);
+ const union value *vp = NULL;
+ if (value_labels)
+ {
+ vp = val_labs_find_value (value_labels, in);
+ if (vp)
+ value_copy (&val, vp, width);
+ }
+ char *xx = NULL;
+ if (vp == NULL)
+ {
+ xx = data_in (ss_cstr (in), psppire_dict_encoding (store->dict),
+ fmt->type, settings_get_fmt_settings (),
+ &val, width, "UTF-8");
+ }
GVariant *vrnt = value_variant_new (&val, width);
value_destroy (&val, width);
iface->iter_parent = NULL;
}
-
-GType
-psppire_data_store_get_type (void)
-{
- static GType data_store_type = 0;
-
- if (!data_store_type)
- {
- static const GTypeInfo data_store_info =
- {
- sizeof (PsppireDataStoreClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) psppire_data_store_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (PsppireDataStore),
- 0,
- (GInstanceInitFunc) psppire_data_store_init,
- };
-
- static const GInterfaceInfo tree_model_info = {
- (GInterfaceInitFunc) __tree_model_init,
- NULL,
- NULL
- };
-
- data_store_type = g_type_register_static (G_TYPE_OBJECT,
- "PsppireDataStore",
- &data_store_info, 0);
-
- g_type_add_interface_static (data_store_type, GTK_TYPE_TREE_MODEL,
- &tree_model_info);
- }
-
- return data_store_type;
-}
-
+G_DEFINE_TYPE_WITH_CODE (PsppireDataStore, psppire_data_store, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+ __tree_model_init))
static void
psppire_data_store_class_init (PsppireDataStoreClass *class)
GObjectClass *object_class;
parent_class = g_type_class_peek_parent (class);
- object_class = (GObjectClass*) class;
+ object_class = G_OBJECT_CLASS (class);
object_class->finalize = psppire_data_store_finalize;
object_class->dispose = psppire_data_store_dispose;
int new_width = var_get_width (aux->new_variable);
const char *enc = dict_get_encoding (aux->dict);
const struct fmt_spec *newfmt = var_get_print_format (aux->new_variable);
- char *s = data_out (old, enc, var_get_print_format (aux->old_variable));
+ char *s = data_out (old, enc, var_get_print_format (aux->old_variable),
+ settings_get_fmt_settings ());
enum fmt_type type = (fmt_usable_for_input (newfmt->type)
? newfmt->type
: FMT_DOLLAR);
- free (data_in (ss_cstr (s), enc, type, new, new_width, enc));
+ free (data_in (ss_cstr (s), enc, type, settings_get_fmt_settings (),
+ new, new_width, enc));
free (s);
}
struct casereader *
psppire_data_store_get_reader (PsppireDataStore *ds)
{
- int i;
struct casereader *reader ;
if (ds->dict)
- for (i = 0 ; i < n_dict_signals; ++i)
+ for (int i = 0 ; i < n_dict_signals; ++i)
{
g_signal_handler_block (ds->dict,
ds->dict_handler_id[i]);
FALSE);
value_init (&value, width);
ok = (datasheet_get_value (ds->datasheet, casenum, idx, &value)
- && data_in_msg (input, UTF8, fmt->type, &value, width,
- dict_get_encoding (dict->dict))
+ && data_in_msg (input, UTF8, fmt->type, settings_get_fmt_settings (),
+ &value, width, dict_get_encoding (dict->dict))
&& datasheet_put_value (ds->datasheet, casenum, idx, &value));
value_destroy (&value, width);