projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
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 5f82d1512be3a821dd01783f73bdc2049c0f93a6..21736da8c645239dec3dadcde4cae59765d0f712 100644
(file)
--- a/
src/language/data-io/combine-files.c
+++ b/
src/language/data-io/combine-files.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009, 2010, 2011
, 2012
Free Software Foundation, Inc.
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
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
@@
-223,11
+223,11
@@
combine_files (enum comb_command_type command,
}
else
{
}
else
{
- file->handle = fh_parse (lexer, FH_REF_FILE
| FH_REF_SCRATCH
);
+ file->handle = fh_parse (lexer, FH_REF_FILE
, dataset_session (ds)
);
if (file->handle == NULL)
goto error;
if (file->handle == NULL)
goto error;
- file->reader = any_reader_open (file->handle, &file->dict);
+ file->reader = any_reader_open (file->handle,
NULL,
&file->dict);
if (file->reader == NULL)
goto error;
}
if (file->reader == NULL)
goto error;
}
@@
-376,7
+376,7
@@
combine_files (enum comb_command_type command,
{
if (command == COMB_UPDATE)
{
{
if (command == COMB_UPDATE)
{
-
msg (SE, _("The BY subcommand is required.")
);
+
lex_sbc_missing ("BY"
);
goto error;
}
if (n_tables)
goto error;
}
if (n_tables)