gboolean
-psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_cases, gint first)
+psppire_case_file_delete_cases (PsppireCaseFile *cf, casenumber n_cases, casenumber first)
{
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->datasheet, FALSE);
+ g_return_val_if_fail (first + n_cases <=
+ psppire_case_file_get_case_count (cf), FALSE);
+
datasheet_delete_rows (cf->datasheet, first, n_cases);
- g_signal_emit (cf, signals [CASES_DELETED], 0, n_cases, first);
+ g_signal_emit (cf, signals [CASES_DELETED], 0, first, n_cases);
return TRUE;
}
/* Insert case CC into the case file before POSN */
gboolean
psppire_case_file_insert_case (PsppireCaseFile *cf,
- struct ccase *cc,
- gint posn)
+ struct ccase *cc,
+ casenumber posn)
{
struct ccase tmp;
bool result ;
if ( result )
g_signal_emit (cf, signals [CASE_INSERTED], 0, posn);
else
- g_warning ("Cannot insert case at position %d\n", posn);
+ g_warning ("Cannot insert case at position %ld\n", posn);
return result;
}
}
-inline gint
+inline casenumber
psppire_case_file_get_case_count (const PsppireCaseFile *cf)
{
g_return_val_if_fail (cf, FALSE);
/* Set the IDXth value of case C to V.
Returns true if successful, false on I/O error. */
gboolean
-psppire_case_file_set_value (PsppireCaseFile *cf, gint casenum, gint idx,
+psppire_case_file_set_value (PsppireCaseFile *cf, casenumber casenum, gint idx,
union value *v, gint width)
{
bool ok;
/* Set the IDXth value of case C using D_IN */
gboolean
-psppire_case_file_data_in (PsppireCaseFile *cf, gint casenum, gint idx,
+psppire_case_file_data_in (PsppireCaseFile *cf, casenumber casenum, gint idx,
struct substring input, const struct fmt_spec *fmt)
{
union value *value;
/* Resize the cases in the casefile, by inserting N_VALUES into every
- one of them. */
+ one of them at the position immediately preceeding WHERE.
+*/
gboolean
psppire_case_file_insert_values (PsppireCaseFile *cf,
- gint n_values, gint before)
+ gint n_values, gint where)
{
- union value *values;
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->accessible, FALSE);
+ if ( n_values == 0 )
+ return FALSE;
+
+ g_assert (n_values > 0);
+
if ( ! cf->datasheet )
cf->datasheet = datasheet_create (NULL);
- values = xcalloc (n_values, sizeof *values);
- datasheet_insert_columns (cf->datasheet, values, n_values, before);
+ {
+ union value *values = xcalloc (n_values, sizeof *values);
+ datasheet_insert_columns (cf->datasheet, values, n_values, where);
free (values);
+ }
return TRUE;
}
+
/* Fills C with the CASENUMth case.
Returns true on success, false otherwise.
*/
gboolean
-psppire_case_file_get_case (const PsppireCaseFile *cf, gint casenum,
+psppire_case_file_get_case (const PsppireCaseFile *cf, casenumber casenum,
struct ccase *c)
{
g_return_val_if_fail (cf, FALSE);