projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change terminology from "active file" to "active dataset".
[pspp-builds.git]
/
src
/
language
/
data-io
/
combine-files.c
diff --git
a/src/language/data-io/combine-files.c
b/src/language/data-io/combine-files.c
index 58693c62d21d568dd152eb91fd8b0edc86639f46..0f09e735d9eb345a901920636d6850cc8a7071b0 100644
(file)
--- a/
src/language/data-io/combine-files.c
+++ b/
src/language/data-io/combine-files.c
@@
-23,9
+23,9
@@
#include "data/case.h"
#include "data/casereader.h"
#include "data/casewriter.h"
#include "data/case.h"
#include "data/casereader.h"
#include "data/casewriter.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/format.h"
#include "data/dictionary.h"
#include "data/format.h"
-#include "data/procedure.h"
#include "data/subcase.h"
#include "data/variable.h"
#include "language/command.h"
#include "data/subcase.h"
#include "data/variable.h"
#include "language/command.h"
@@
-206,16
+206,16
@@
combine_files (enum comb_command_type command,
if (lex_match (lexer, T_ASTERISK))
{
if (lex_match (lexer, T_ASTERISK))
{
- if (!
proc_has_active_fil
e (ds))
+ if (!
dataset_has_sourc
e (ds))
{
{
- msg (SE, _("Cannot specify the active
file since no activ
e "
- "
file
has been defined."));
+ msg (SE, _("Cannot specify the active
dataset since non
e "
+ "has been defined."));
goto error;
}
if (proc_make_temporary_transformations_permanent (ds))
msg (SE, _("This command may not be used after TEMPORARY when "
goto error;
}
if (proc_make_temporary_transformations_permanent (ds))
msg (SE, _("This command may not be used after TEMPORARY when "
- "the active
file
is an input source. "
+ "the active
dataset
is an input source. "
"Temporary transformations will be made permanent."));
file->dict = dict_clone (dataset_dict (ds));
"Temporary transformations will be made permanent."));
file->dict = dict_clone (dataset_dict (ds));
@@
-303,7
+303,8
@@
combine_files (enum comb_command_type command,
msg (SE, _("File %s lacks BY variable %s."),
fh_get_name (file->handle), name);
else
msg (SE, _("File %s lacks BY variable %s."),
fh_get_name (file->handle), name);
else
- msg (SE, _("Active file lacks BY variable %s."), name);
+ msg (SE, _("Active dataset lacks BY variable %s."),
+ name);
ok = false;
}
}
ok = false;
}
}
@@
-466,7
+467,8
@@
combine_files (enum comb_command_type command,
if (active_file != NULL)
proc_commit (ds);
if (active_file != NULL)
proc_commit (ds);
- proc_set_active_file (ds, casewriter_make_reader (proc.output), proc.dict);
+ dataset_set_dict (ds, proc.dict);
+ dataset_set_source (ds, casewriter_make_reader (proc.output));
proc.dict = NULL;
proc.output = NULL;
proc.dict = NULL;
proc.output = NULL;