/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007, 2009 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
PsppireVarStore *vs ;
PsppireDataStore *ds ;
- fd.xml = builder_new ("psppire.ui");
+ fd.xml = builder_new ("find.ui");
fd.de = de;
find_button = gtk_button_new_from_stock (GTK_STOCK_FIND);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- fd.dict,
- GTK_SELECTION_SINGLE,
- NULL);
+ g_object_set (source, "dictionary", fd.dict,
+ "selection-mode", GTK_SELECTION_SINGLE,
+ NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
source,
static void
forward_wrap (casenumber *i, struct datasheet *data)
{
- if ( ++*i >= datasheet_get_row_cnt (data) ) *i = 0;
+ if ( ++*i >= datasheet_get_n_rows (data) ) *i = 0;
}
static void
backward_wrap (casenumber *i, struct datasheet *data)
{
if ( --*i < 0 )
- *i = datasheet_get_row_cnt (data) - 1;
+ *i = datasheet_get_n_rows (data) - 1;
}
static casenumber
last (casenumber current, struct datasheet *data)
{
- return datasheet_get_row_cnt (data) ;
+ return datasheet_get_n_rows (data) ;
}
static casenumber
struct value_comparator
{
struct comparator parent;
- union value *pattern;
+ union value pattern;
};
/* A comparator which matches string values or parts thereof */
const union value *v)
{
const struct value_comparator *vc = (const struct value_comparator *) cmptr;
- return 0 == value_compare_3way (v, vc->pattern, var_get_width (cmptr->var));
+ return 0 == value_compare_3way (v, &vc->pattern, var_get_width (cmptr->var));
}
const struct string_comparator *ssc =
(const struct string_comparator *) cmptr;
- const char *text = val->s;
int width = var_get_width (cmptr->var);
+ const char *text = value_str (val, width);
assert ( ! (cmptr->flags & STR_CMP_LABELS));
/* We must remove trailing whitespace, otherwise $ will not match where
one would expect */
- text = g_strndup (val->s, width);
+ text = g_strndup (value_str (val, width), width);
g_strchomp (text);
retval = (0 == regexec (&rec->re, text, 0, 0, 0));
}
static void
-value_destroy (struct comparator *cmptr)
+cmptr_value_destroy (struct comparator *cmptr)
{
struct value_comparator *vc = (struct value_comparator *) cmptr;
- free (vc->pattern);
+ value_destroy (&vc->pattern, var_get_width (cmptr->var));
}
cmptr->flags = 0;
cmptr->var = var;
cmptr->compare = value_compare ;
- cmptr->destroy = value_destroy;
+ cmptr->destroy = cmptr_value_destroy;
width = var_get_width (var);
fmt = var_get_write_format (var);
- vc->pattern = value_create (width);
+ value_init (&vc->pattern, width);
if ( ! data_in (ss_cstr (target),
LEGACY_NATIVE,
fmt->type,
0, 0, 0,
- vc->pattern, width) )
+ &vc->pattern, width) )
{
+ value_destroy (&vc->pattern, width);
free (vc);
return NULL;
}
flags |= STR_CMP_LABELS;
{
- union value *val = value_create (width);
+ union value val;
casenumber i;
const struct casenum_iterator *ip = get_iteration_params (fd);
struct comparator *cmptr =
comparator_factory (var, target_string, flags);
+ value_init (&val, width);
if ( ! cmptr)
goto finish;
i != ip->end (current_row, fd->data);
ip->next (&i, fd->data))
{
- datasheet_get_value (fd->data, i, var_get_case_index (var),
- val, width);
+ datasheet_get_value (fd->data, i, var_get_case_index (var), &val);
- if ( comparator_compare (cmptr, val))
+ if ( comparator_compare (cmptr, &val))
{
*row = i;
break;
finish:
comparator_destroy (cmptr);
- free (val);
+ value_destroy (&val, width);
}
}