+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2007 Free Software Foundation
+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+
/* This file is a rubbish bin where stuff gets put when it doesn't seem to
belong anywhere else.
*/
#include <data/data-in.h>
#include <data/data-out.h>
#include <data/dictionary.h>
-#include <data/storage-stream.h>
#include <libpspp/message.h>
#include <libpspp/i18n.h>
return w;
}
-/* Converts a string in the pspp locale to utf-8 */
-char *
+/* Converts a string in the pspp locale to utf-8.
+ The return value must be freed when no longer required*/
+gchar *
pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err)
{
return recode_string (CONV_PSPP_TO_UTF8, text, len);
gboolean
execute_syntax (struct getl_interface *sss)
{
+ gboolean status;
struct lexer *lexer;
- g_return_val_if_fail (proc_has_source (the_dataset), FALSE);
+ struct casereader *reader = psppire_data_store_get_reader (the_data_store);
+
+ proc_set_active_file_data (the_dataset, reader);
+
+ g_return_val_if_fail (proc_has_active_file (the_dataset), FALSE);
lexer = lex_create (the_source_stream);
lex_destroy (lexer);
- /* The GUI must *always* have a data source, even if it's an empty one.
- Therefore, we find that there is none, (for example NEW FILE was the last
- item in the syntax) then we create a new one. */
- if ( ! proc_has_source (the_dataset))
- proc_set_source (the_dataset,
- storage_source_create (the_data_store->case_file->flexifile)
- );
-
/* GUI syntax needs this implicit EXECUTE command at the end of
- every script. Otherwise commands like GET could leave the GUI without
- a casefile. */
- return procedure (the_dataset, NULL, NULL);
+ every script. Otherwise commands like GET could leave the GUI
+ without a datasheet. */
+ status = proc_execute (the_dataset);
+
+ psppire_dict_replace_dictionary (the_data_store->dict,
+ dataset_dict (the_dataset));
+
+ {
+ PsppireCaseFile *pcf = psppire_case_file_new (dataset_source (the_dataset));
+
+ psppire_data_store_set_case_file (the_data_store, pcf);
+ }
+
+ return status;
}