#include <data/dictionary.h>
#include <data/file-handle-def.h>
#include <data/procedure.h>
-#include <data/settings.h>
#include <data/storage-stream.h>
#include <data/transformations.h>
-#include <data/value-labels.h>
#include <data/variable.h>
#include <language/expressions/public.h>
#include <libpspp/alloc.h>
-#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
-#include <output/manager.h>
-#include <output/table.h>
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
/*
Virtual File Manager (vfm):
struct write_case_data
{
/* Function to call for each case. */
- bool (*proc_func) (struct ccase *, void *); /* Function. */
+ bool (*case_func) (struct ccase *, void *); /* Function. */
void *aux; /* Auxiliary data. */
struct ccase trns_case; /* Case used for transformations. */
static void add_filter_trns (void);
static void add_process_if_trns (void);
-static bool internal_procedure (bool (*proc_func) (struct ccase *, void *),
+static bool internal_procedure (bool (*case_func) (struct ccase *, void *),
+ bool (*end_func) (void *),
void *aux);
static void update_last_vfm_invocation (void);
static void create_trns_case (struct ccase *, struct dictionary *);
update_last_vfm_invocation ();
return last_vfm_invocation;
}
+\f
+/* Regular procedure. */
/* Reads the data from the input program and writes it to a new
active file. For each case we read from the input program, we
bool
procedure (bool (*proc_func) (struct ccase *, void *), void *aux)
{
- if (proc_func == NULL
- && case_source_is_class (vfm_source, &storage_source_class)
- && vfm_sink == NULL
- && temporary_trns_chain == NULL
- && trns_chain_is_empty (permanent_trns_chain))
- {
- expr_free (process_if_expr);
- process_if_expr = NULL;
- dict_set_case_limit (default_dict, 0);
- dict_clear_vectors (default_dict);
+ return internal_procedure (proc_func, NULL, aux);
+}
+\f
+/* Multipass procedure. */
- update_last_vfm_invocation ();
- return true;
- }
- else
- {
- bool ok;
-
- open_active_file ();
- ok = internal_procedure (proc_func, aux);
- ok = close_active_file () && ok;
+struct multipass_aux_data
+ {
+ struct casefile *casefile;
+
+ bool (*proc_func) (const struct casefile *, void *aux);
+ void *aux;
+ };
- return ok;
- }
+/* Case processing function for multipass_procedure(). */
+static bool
+multipass_case_func (struct ccase *c, void *aux_data_)
+{
+ struct multipass_aux_data *aux_data = aux_data_;
+ return casefile_append (aux_data->casefile, c);
}
-/* Callback function for multipass_procedure(). */
+/* End-of-file function for multipass_procedure(). */
static bool
-multipass_callback (struct ccase *c, void *cf_)
+multipass_end_func (void *aux_data_)
{
- struct casefile *cf = cf_;
- return casefile_append (cf, c);
+ struct multipass_aux_data *aux_data = aux_data_;
+ return (aux_data->proc_func == NULL
+ || aux_data->proc_func (aux_data->casefile, aux_data->aux));
}
/* Procedure that allows multiple passes over the input data.
multipass_procedure (bool (*proc_func) (const struct casefile *, void *aux),
void *aux)
{
- if (case_source_is_class (vfm_source, &storage_source_class)
- && vfm_sink == NULL
- && temporary_trns_chain == NULL
- && trns_chain_is_empty (permanent_trns_chain))
- {
- proc_func (storage_source_get_casefile (vfm_source), aux);
-
- expr_free (process_if_expr);
- process_if_expr = NULL;
- dict_set_case_limit (default_dict, 0);
- dict_clear_vectors (default_dict);
-
- update_last_vfm_invocation ();
- return true;
- }
- else
- {
- struct casefile *cf;
- bool ok;
-
- assert (proc_func != NULL);
+ struct multipass_aux_data aux_data;
+ bool ok;
- cf = casefile_create (dict_get_next_value_idx (default_dict));
+ aux_data.casefile = casefile_create (dict_get_next_value_idx (default_dict));
+ aux_data.proc_func = proc_func;
+ aux_data.aux = aux;
- open_active_file ();
- ok = internal_procedure (multipass_callback, cf);
- ok = proc_func (cf, aux) && ok;
- ok = close_active_file () && ok;
+ ok = internal_procedure (multipass_case_func, multipass_end_func, &aux_data);
+ ok = !casefile_error (aux_data.casefile) && ok;
- casefile_destroy (cf);
+ casefile_destroy (aux_data.casefile);
- return ok;
- }
+ return ok;
}
+\f
+/* Procedure implementation. */
-/* Executes a procedure, as procedure(), except that the caller
- is responsible for calling open_active_file() and
- close_active_file().
- Returns true if successful, false if an I/O error occurred. */
+/* Executes a procedure.
+ Passes each case to CASE_FUNC.
+ Calls END_FUNC after the last case.
+ Returns true if successful, false if an I/O error occurred (or
+ if CASE_FUNC or END_FUNC ever returned false). */
static bool
-internal_procedure (bool (*proc_func) (struct ccase *, void *), void *aux)
+internal_procedure (bool (*case_func) (struct ccase *, void *),
+ bool (*end_func) (void *),
+ void *aux)
{
struct write_case_data wc_data;
- bool ok;
+ bool ok = true;
+
+ assert (vfm_source != NULL);
- wc_data.proc_func = proc_func;
+ update_last_vfm_invocation ();
+
+ /* Optimize the trivial case where we're not going to do
+ anything with the data, by not reading the data at all. */
+ if (case_func == NULL && end_func == NULL
+ && case_source_is_class (vfm_source, &storage_source_class)
+ && vfm_sink == NULL
+ && (temporary_trns_chain == NULL
+ || trns_chain_is_empty (temporary_trns_chain))
+ && trns_chain_is_empty (permanent_trns_chain))
+ {
+ n_lag = 0;
+ expr_free (process_if_expr);
+ process_if_expr = NULL;
+ dict_set_case_limit (default_dict, 0);
+ dict_clear_vectors (default_dict);
+ return true;
+ }
+
+ open_active_file ();
+
+ wc_data.case_func = case_func;
wc_data.aux = aux;
create_trns_case (&wc_data.trns_case, default_dict);
case_create (&wc_data.sink_case, dict_get_next_value_idx (default_dict));
wc_data.cases_written = 0;
- update_last_vfm_invocation ();
-
- ok = (vfm_source == NULL
- || vfm_source->class->read (vfm_source,
- &wc_data.trns_case,
- write_case, &wc_data));
+ ok = vfm_source->class->read (vfm_source,
+ &wc_data.trns_case,
+ write_case, &wc_data) && ok;
+ if (end_func != NULL)
+ ok = end_func (aux) && ok;
case_destroy (&wc_data.sink_case);
case_destroy (&wc_data.trns_case);
+ ok = close_active_file () && ok;
+
return ok;
}
}
/* Pass case to procedure. */
- if (wc_data->proc_func != NULL)
- if (!wc_data->proc_func (&wc_data->trns_case, wc_data->aux))
+ if (wc_data->case_func != NULL)
+ if (!wc_data->case_func (&wc_data->trns_case, wc_data->aux))
retval = TRNS_ERROR;
done:
if (compactor != NULL)
{
dict_compactor_destroy (compactor);
- dict_compact_values (default_dict);
+ dict_compact_values (default_dict);
+ compactor = NULL;
}
/* Free data source. */
return NULL;
}
\f
+/* Procedure that separates the data into SPLIT FILE groups. */
+
/* Represents auxiliary data for handling SPLIT FILE. */
struct split_aux_data
{
size_t case_count; /* Number of cases so far. */
struct ccase prev_case; /* Data in previous case. */
- /* Functions to call... */
- void (*begin_func) (void *); /* ...before data. */
- bool (*proc_func) (struct ccase *, void *); /* ...with data. */
- void (*end_func) (void *); /* ...after data. */
- void *func_aux; /* Auxiliary data. */
+ /* Callback functions. */
+ void (*begin_func) (const struct ccase *, void *);
+ bool (*proc_func) (const struct ccase *, void *);
+ void (*end_func) (void *);
+ void *func_aux;
};
static int equal_splits (const struct ccase *, const struct ccase *);
-static bool procedure_with_splits_callback (struct ccase *, void *);
-static void dump_splits (struct ccase *);
+static bool split_procedure_case_func (struct ccase *c, void *split_aux_);
+static bool split_procedure_end_func (void *split_aux_);
/* Like procedure(), but it automatically breaks the case stream
into SPLIT FILE break groups. Before each group of cases with
- identical SPLIT FILE variable values, BEGIN_FUNC is called.
- Then PROC_FUNC is called with each case in the group.
+ identical SPLIT FILE variable values, BEGIN_FUNC is called
+ with the first case in the group.
+ Then PROC_FUNC is called for each case in the group (including
+ the first).
END_FUNC is called when the group is finished. FUNC_AUX is
passed to each of the functions as auxiliary data.
Returns true if successful, false if an I/O error occurred. */
bool
-procedure_with_splits (void (*begin_func) (void *aux),
- bool (*proc_func) (struct ccase *, void *aux),
+procedure_with_splits (void (*begin_func) (const struct ccase *, void *aux),
+ bool (*proc_func) (const struct ccase *, void *aux),
void (*end_func) (void *aux),
void *func_aux)
{
split_aux.end_func = end_func;
split_aux.func_aux = func_aux;
- open_active_file ();
- ok = internal_procedure (procedure_with_splits_callback, &split_aux);
- if (split_aux.case_count > 0 && end_func != NULL)
- end_func (func_aux);
- if (!close_active_file ())
- ok = false;
+ ok = internal_procedure (split_procedure_case_func,
+ split_procedure_end_func, &split_aux);
case_destroy (&split_aux.prev_case);
return ok;
}
-/* procedure() callback used by procedure_with_splits(). */
+/* Case callback used by procedure_with_splits(). */
static bool
-procedure_with_splits_callback (struct ccase *c, void *split_aux_)
+split_procedure_case_func (struct ccase *c, void *split_aux_)
{
struct split_aux_data *split_aux = split_aux_;
if (split_aux->case_count > 0 && split_aux->end_func != NULL)
split_aux->end_func (split_aux->func_aux);
- dump_splits (c);
case_destroy (&split_aux->prev_case);
case_clone (&split_aux->prev_case, c);
if (split_aux->begin_func != NULL)
- split_aux->begin_func (split_aux->func_aux);
+ split_aux->begin_func (&split_aux->prev_case, split_aux->func_aux);
}
split_aux->case_count++;
- if (split_aux->proc_func != NULL)
- return split_aux->proc_func (c, split_aux->func_aux);
- else
- return true;
+ return (split_aux->proc_func == NULL
+ || split_aux->proc_func (c, split_aux->func_aux));
+}
+
+/* End-of-file callback used by procedure_with_splits(). */
+static bool
+split_procedure_end_func (void *split_aux_)
+{
+ struct split_aux_data *split_aux = split_aux_;
+
+ if (split_aux->case_count > 0 && split_aux->end_func != NULL)
+ split_aux->end_func (split_aux->func_aux);
+ return true;
}
/* Compares the SPLIT FILE variables in cases A and B and returns
dict_get_split_vars (default_dict),
dict_get_split_cnt (default_dict)) == 0;
}
-
-/* Dumps out the values of all the split variables for the case C. */
-static void
-dump_splits (struct ccase *c)
-{
- struct variable *const *split;
- struct tab_table *t;
- size_t split_cnt;
- int i;
-
- split_cnt = dict_get_split_cnt (default_dict);
- if (split_cnt == 0)
- return;
-
- t = tab_create (3, split_cnt + 1, 0);
- tab_dim (t, tab_natural_dimensions);
- tab_vline (t, TAL_GAP, 1, 0, split_cnt);
- tab_vline (t, TAL_GAP, 2, 0, split_cnt);
- tab_text (t, 0, 0, TAB_NONE, _("Variable"));
- tab_text (t, 1, 0, TAB_LEFT, _("Value"));
- tab_text (t, 2, 0, TAB_LEFT, _("Label"));
- split = dict_get_split_vars (default_dict);
- for (i = 0; i < split_cnt; i++)
- {
- struct variable *v = split[i];
- char temp_buf[80];
- const char *val_lab;
-
- assert (v->type == NUMERIC || v->type == ALPHA);
- tab_text (t, 0, i + 1, TAB_LEFT | TAT_PRINTF, "%s", v->name);
-
- data_out (temp_buf, &v->print, case_data (c, v->fv));
-
- temp_buf[v->print.w] = 0;
- tab_text (t, 1, i + 1, TAT_PRINTF, "%.*s", v->print.w, temp_buf);
-
- val_lab = val_labs_find (v->val_labs, *case_data (c, v->fv));
- if (val_lab)
- tab_text (t, 2, i + 1, TAB_LEFT, val_lab);
- }
- tab_flags (t, SOMF_NO_TITLE);
- tab_submit (t);
-}
\f
+/* Multipass procedure that separates the data into SPLIT FILE
+ groups. */
+
/* Represents auxiliary data for handling SPLIT FILE in a
multipass procedure. */
struct multipass_split_aux_data
struct casefile *casefile; /* Accumulates data for a split. */
/* Function to call with the accumulated data. */
- bool (*split_func) (const struct casefile *, void *);
+ bool (*split_func) (const struct ccase *first, const struct casefile *,
+ void *);
void *func_aux; /* Auxiliary data. */
};
-static bool multipass_split_callback (struct ccase *c, void *aux_);
+static bool multipass_split_case_func (struct ccase *c, void *aux_);
+static bool multipass_split_end_func (void *aux_);
static bool multipass_split_output (struct multipass_split_aux_data *);
/* Returns true if successful, false if an I/O error occurred. */
bool
-multipass_procedure_with_splits (bool (*split_func) (const struct casefile *,
- void *),
- void *func_aux)
+multipass_procedure_with_splits (bool (*split_func) (const struct ccase *first,
+ const struct casefile *,
+ void *aux),
+ void *func_aux)
{
struct multipass_split_aux_data aux;
bool ok;
- assert (split_func != NULL);
-
- open_active_file ();
-
case_nullify (&aux.prev_case);
aux.casefile = NULL;
aux.split_func = split_func;
aux.func_aux = func_aux;
- ok = internal_procedure (multipass_split_callback, &aux);
- if (aux.casefile != NULL)
- ok = multipass_split_output (&aux) && ok;
+ ok = internal_procedure (multipass_split_case_func,
+ multipass_split_end_func, &aux);
case_destroy (&aux.prev_case);
- if (!close_active_file ())
- ok = false;
-
return ok;
}
-/* procedure() callback used by multipass_procedure_with_splits(). */
+/* Case callback used by multipass_procedure_with_splits(). */
static bool
-multipass_split_callback (struct ccase *c, void *aux_)
+multipass_split_case_func (struct ccase *c, void *aux_)
{
struct multipass_split_aux_data *aux = aux_;
bool ok = true;
/* Start a new series if needed. */
if (aux->casefile == NULL || !equal_splits (c, &aux->prev_case))
{
+ /* Record split values. */
+ case_destroy (&aux->prev_case);
+ case_clone (&aux->prev_case, c);
+
/* Pass any cases to split_func. */
if (aux->casefile != NULL)
ok = multipass_split_output (aux);
/* Start a new casefile. */
aux->casefile = casefile_create (dict_get_next_value_idx (default_dict));
-
- /* Record split values. */
- dump_splits (c);
- case_destroy (&aux->prev_case);
- case_clone (&aux->prev_case, c);
}
return casefile_append (aux->casefile, c) && ok;
}
+/* End-of-file callback used by multipass_procedure_with_splits(). */
+static bool
+multipass_split_end_func (void *aux_)
+{
+ struct multipass_split_aux_data *aux = aux_;
+ return (aux->casefile == NULL || multipass_split_output (aux));
+}
+
static bool
multipass_split_output (struct multipass_split_aux_data *aux)
{
bool ok;
assert (aux->casefile != NULL);
- ok = aux->split_func (aux->casefile, aux->func_aux);
+ ok = aux->split_func (&aux->prev_case, aux->casefile, aux->func_aux);
casefile_destroy (aux->casefile);
aux->casefile = NULL;
return ok;
}
-
+\f
/* Discards all the current state in preparation for a data-input
command like DATA LIST or GET. */
void
n_lag = 0;
- if (vfm_source != NULL)
- {
- free_case_source (vfm_source);
- vfm_source = NULL;
- }
+ free_case_source (vfm_source);
+ vfm_source = NULL;
proc_cancel_all_transformations ();
projects / pspp-builds.git / blobdiff