if (file->handle == NULL)
goto error;
- file->reader = any_reader_open (file->handle, NULL, &file->dict);
+ file->reader = any_reader_open_and_decode (file->handle, NULL,
+ &file->dict, NULL);
if (file->reader == NULL)
goto error;
}
while (lex_match (lexer, T_SLASH))
if (lex_match_id (lexer, "RENAME"))
{
- if (!parse_dict_rename (lexer, file->dict))
+ if (!parse_dict_rename (lexer, file->dict, false))
goto error;
}
else if (lex_match_id (lexer, "IN"))
The correct thing to do would be to convert to an encoding
which can cope with all the input files (eg UTF-8).
*/
- if ( 0 != strcmp (dict_get_encoding (f->dict), dict_get_encoding (m)))
+ if (0 != strcmp (dict_get_encoding (f->dict), dict_get_encoding (m)))
msg (MW, _("Combining files with incompatible encodings. String data may "
"not be represented correctly."));
subcase_destroy (&file->dst);
free (file->mv);
fh_unref (file->handle);
- dict_destroy (file->dict);
+ dict_unref (file->dict);
casereader_destroy (file->reader);
case_unref (file->data);
free (file->in_name);
free_comb_proc (struct comb_proc *proc)
{
close_all_comb_files (proc);
- dict_destroy (proc->dict);
+ dict_unref (proc->dict);
casewriter_destroy (proc->output);
case_matcher_destroy (proc->matcher);
if (proc->prev_BY)
size_t i;
output = create_output_case (proc);
- for (i = proc->n_files; i-- > 0; )
+ for (i = proc->n_files; i-- > 0;)
{
struct comb_file *file = &proc->files[i];
if (file->type == COMB_FILE)
{
struct comb_file *file = &proc->files[i];
if (file->in_var != NULL)
- case_data_rw (output, file->in_var)->f = false;
+ *case_num_rw (output, file->in_var) = false;
}
return output;
}
mark_file_used (const struct comb_file *file, struct ccase *output)
{
if (file->in_var != NULL)
- case_data_rw (output, file->in_var)->f = true;
+ *case_num_rw (output, file->in_var) = true;
}
/* Copies the data from FILE's case into output case OUTPUT.
{
new_BY = !subcase_equal_xx (&proc->by_vars, proc->prev_BY, by);
if (proc->last != NULL)
- case_data_rw (proc->buffered_case, proc->last)->f = new_BY;
+ *case_num_rw (proc->buffered_case, proc->last) = new_BY;
casewriter_write (proc->output, proc->buffered_case);
}
else
proc->buffered_case = output;
if (proc->first != NULL)
- case_data_rw (proc->buffered_case, proc->first)->f = new_BY;
+ *case_num_rw (proc->buffered_case, proc->first) = new_BY;
if (new_BY)
{
if (proc->prev_BY != NULL)
{
if (proc->last != NULL)
- case_data_rw (proc->buffered_case, proc->last)->f = 1.0;
+ *case_num_rw (proc->buffered_case, proc->last) = 1.0;
casewriter_write (proc->output, proc->buffered_case);
proc->buffered_case = NULL;
}