#include <data/casefile.h>
#include <data/case.h>
+#include <data/data-out.h>
#include <gtksheet/gtksheet.h>
#include <gtksheet/gsheetmodel.h>
for (v = 0 ; v < psppire_dict_get_var_cnt (ds->dict) ; ++v)
{
const struct PsppireVariable *pv = psppire_dict_get_variable(ds->dict, v);
- if (ALPHA == psppire_variable_get_type(pv) )
+ if (VAR_STRING == psppire_variable_get_type(pv) )
continue;
- case_data_rw (&cc, psppire_variable_get_fv (pv))->f = SYSMIS;
+ case_data_rw_idx (&cc, psppire_variable_get_fv (pv))->f = SYSMIS;
}
result = psppire_case_file_insert_case (ds->case_file, &cc, posn);
/* Converts binary value V into printable form in the exactly
FP->W character in buffer S according to format specification
FP. No null terminator is appended to the buffer. */
- data_out (s->str, fp, v);
+ data_out (v, fp, s->str);
text = pspp_locale_to_utf8 (s->str, fp->w, 0);
g_string_free (s, TRUE);
const gint index = psppire_variable_get_fv(pv) ;
- if ( psppire_variable_get_type(pv) == NUMERIC)
+ if ( psppire_variable_get_type(pv) == VAR_NUMERIC)
v.f = SYSMIS;
else
memcpy(v.s, "", MAX_SHORT_STRING);
}
#endif
- {
- const gint index = psppire_variable_get_fv(pv);
-
- struct data_in d_in;
- d_in.s = text;
- d_in.e = text + strlen(text);
- d_in.v = 0;
- d_in.f1 = d_in.f2 = 0;
- d_in.format = * psppire_variable_get_write_spec(pv);
- d_in.flags = 0;
-
- psppire_case_file_data_in(store->case_file, row, index, &d_in) ;
- }
-
+ psppire_case_file_data_in (store->case_file, row,
+ psppire_variable_get_fv (pv), ss_cstr (text),
+ psppire_variable_get_write_spec (pv));
+
return TRUE;
}