/*
PSPPIRE --- A Graphical User Interface for PSPP
Copyright (C) 2006 Free Software Foundation
- Written by John Darrington
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
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
-
+#include <config.h>
#include <string.h>
#include <stdlib.h>
#include <data/case.h>
#include <ui/flexifile.h>
+#include "flexifile-factory.h"
#include <data/casefile.h>
#include <data/data-in.h>
#include <math/sort.h>
cf->flexifile = 0;
}
+
/**
* psppire_case_file_new:
* @returns: a new #PsppireCaseFile object
}
+/**
+ * psppire_case_file_new_from_flexifile:
+ * @returns: a new #PsppireCaseFile object
+ *
+ * Creates a new #PsppireCaseFile from an existing flexifile
+ */
+PsppireCaseFile*
+psppire_case_file_new_from_flexifile (struct flexifile *ff)
+{
+ PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL);
+
+ cf->flexifile = (struct casefile *) ff;
+
+ return cf;
+}
+
+
gboolean
psppire_case_file_delete_cases(PsppireCaseFile *cf, gint n_cases, gint first)
{
flexifile_get_case(FLEXIFILE(cf->flexifile), casenum, &c);
- v = case_data(&c, idx);
-
+ v = case_data_idx(&c, idx);
case_destroy(&c);
return v;
bytes = DIV_RND_UP(width, MAX_SHORT_STRING) * MAX_SHORT_STRING ;
/* Cast away const in flagrant abuse of the casefile */
- memcpy((union value *)case_data(&cc, idx), v, bytes);
+ memcpy((union value *)case_data_idx(&cc, idx), v, bytes);
g_signal_emit(cf, signal[CASE_CHANGED], 0, casenum);
/* Set the IDXth value of case C using D_IN */
gboolean
psppire_case_file_data_in(PsppireCaseFile *cf, gint casenum, gint idx,
- struct data_in *d_in)
+ struct substring input, const struct fmt_spec *fmt)
{
struct ccase cc ;
return FALSE;
/* Cast away const in flagrant abuse of the casefile */
- d_in->v = (union value *) case_data(&cc, idx);
-
- if ( ! data_in(d_in) )
+ if (!data_in (input, fmt->type, 0, 0,
+ (union value *) case_data_idx(&cc, idx), fmt_var_width (fmt)))
g_warning("Cant set value\n");
g_signal_emit(cf, signal[CASE_CHANGED], 0, casenum);
void
psppire_case_file_sort(PsppireCaseFile *cf, const struct sort_criteria *sc)
{
- struct ccase cc;
gint c;
- struct casefile *cfile;
- struct casereader *reader = casefile_get_reader(cf->flexifile);
- const int value_cnt = casefile_get_value_cnt(cf->flexifile);
- cfile = sort_execute(reader, sc);
+ struct casereader *reader = casefile_get_reader (cf->flexifile, NULL);
+ struct casefile *cfile;
- casefile_destroy(cf->flexifile);
+ struct casefile_factory *factory = flexifile_factory_create ();
- /* Copy casefile into flexifile */
+ cfile = sort_execute(reader, sc, factory);
- reader = casefile_get_destructive_reader(cfile);
- cf->flexifile = flexifile_create(value_cnt);
- while(casereader_read(reader, &cc))
- casefile_append(cf->flexifile, &cc);
+ casefile_destroy(cf->flexifile);
+ cf->flexifile = cfile;
/* FIXME: Need to have a signal to change a range of cases, instead of
calling a signal many times */
for ( c = 0 ; c < casefile_get_case_cnt(cf->flexifile) ; ++c )
g_signal_emit(cf, signal[CASE_CHANGED], 0, c);
+
+ flexifile_factory_destroy (factory);
}
if ( ! cf->flexifile )
{
cf->flexifile = flexifile_create(n_values);
+
return TRUE;
}