/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007, 2009 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
*/
#include <config.h>
-#include "psppire-syntax-window.h"
-
#include <glib-object.h>
#include <glib.h>
#include <data/dictionary.h>
#include <data/casereader-provider.h>
#include <libpspp/message.h>
-
+#include "psppire-syntax-window.h"
#include <gtk/gtkbuilder.h>
#include <libpspp/i18n.h>
#include <stdlib.h>
#include <data/settings.h>
-#include <language/command.h>
-#include <data/lazy-casereader.h>
-#include <data/procedure.h>
-#include <language/lexer/lexer.h>
#include "psppire-data-store.h"
-#include <output/manager.h>
-#include "psppire-output-window.h"
#include "xalloc.h"
/* Formats a value according to FORMAT
The returned string must be freed when no longer required */
gchar *
-value_to_text (union value v, struct fmt_spec format)
+value_to_text (union value v, const PsppireDict *dict, struct fmt_spec format)
{
gchar *s = 0;
- s = g_new (gchar, format.w + 1);
- data_out (&v, &format, s);
- s[format.w]='\0';
+ s = data_out (&v, dict_get_encoding (dict->dict), &format);
g_strchug (s);
return s;
}
+/* Converts TEXT to a value.
+
+ VAL will be initialised and filled by this function.
+ It is the caller's responsibility to destroy VAL when no longer needed.
+ VAR and DICT must be the variable and dictionary with which VAL
+ is associated.
-gboolean
-text_to_value (const gchar *text, union value *v,
- struct fmt_spec format)
+ On success, VAL is returned, NULL otherwise.
+*/
+union value *
+text_to_value (const gchar *text,
+ const PsppireDict *dict,
+ const struct variable *var,
+ union value *val)
{
- bool ok;
+ const struct fmt_spec *format = var_get_print_format (var);
+ int width = var_get_width (var);
- if ( format.type != FMT_A)
+ if ( format->type != FMT_A)
{
- if ( ! text ) return FALSE;
+ if ( ! text ) return NULL;
{
const gchar *s = text;
s++;
}
- if ( !*s) return FALSE;
+ if ( !*s) return NULL;
}
}
+ value_init (val, width);
msg_disable ();
- ok = data_in (ss_cstr (text), LEGACY_NATIVE, format.type, 0, 0, 0,
- v, fmt_var_width (&format));
+ data_in (ss_cstr (text), UTF8, format->type, 0, 0, 0,
+ dict->dict,
+ val, width);
msg_enable ();
- return ok;
+ return val;
}
return GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET));
}
-/* Converts a string in the pspp locale to utf-8.
- The return value must be freed when no longer required*/
+/* This function must be used whenever a filename generated by glib,
+ (eg, from gtk_file_chooser_get_filename) and passed to the C library,
+ (eg through a pspp syntax string).
+*/
gchar *
-pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err)
+convert_glib_filename_to_system_filename (const gchar *fname, GError **err)
{
- return recode_string (CONV_PSPP_TO_UTF8, text, len);
+ gchar *output_name;
+
+#ifdef G_OS_WIN32
+ const gchar *target_encoding;
+ gchar *utf8_name = NULL;
+
+ g_get_charset (&target_encoding);
+
+ output_name = g_convert (fname, -1, target_encoding,
+ "UTF-8", NULL, NULL, err);
+#else
+ output_name = xstrdup (fname);
+#endif
+
+ return output_name;
}
+
+
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
}
-extern struct dataset *the_dataset;
-extern struct source_stream *the_source_stream;
-extern PsppireDataStore *the_data_store;
-
-/* Lazy casereader callback function used by execute_syntax. */
-static struct casereader *
-create_casereader_from_data_store (void *data_store_)
-{
- PsppireDataStore *data_store = data_store_;
- return psppire_data_store_get_reader (data_store);
-}
-
-gboolean
-execute_syntax (struct getl_interface *sss)
-{
- struct lexer *lexer;
- gboolean retval = TRUE;
-
- struct casereader *reader;
- size_t value_cnt;
- casenumber case_cnt;
- unsigned long int lazy_serial;
-
- /* When the user executes a number of snippets of syntax in a
- row, none of which read from the active file, the GUI becomes
- progressively less responsive. The reason is that each syntax
- execution encapsulates the active file data in another
- datasheet layer. The cumulative effect of having a number of
- layers of datasheets wastes time and space.
-
- To solve the problem, we use a "lazy casereader", a wrapper
- around the casereader obtained from the data store, that
- only actually instantiates that casereader when it is
- needed. If the data store casereader is never needed, then
- it is reused the next time syntax is run, without wrapping
- it in another layer. */
- value_cnt = psppire_data_store_get_value_count (the_data_store);
- case_cnt = psppire_data_store_get_case_count (the_data_store);
- reader = lazy_casereader_create (value_cnt, case_cnt,
- create_casereader_from_data_store,
- the_data_store, &lazy_serial);
- 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);
-
- getl_append_source (the_source_stream, sss, GETL_BATCH, ERRMODE_CONTINUE);
-
- for (;;)
- {
- enum cmd_result result = cmd_parse (lexer, the_dataset);
-
- if ( cmd_result_is_failure (result))
- {
- retval = FALSE;
- if ( source_stream_current_error_mode (the_source_stream)
- == ERRMODE_STOP )
- break;
- }
-
- if ( result == CMD_EOF || result == CMD_FINISH)
- break;
- }
-
- getl_abort_noninteractive (the_source_stream);
-
- lex_destroy (lexer);
-
- psppire_dict_replace_dictionary (the_data_store->dict,
- dataset_dict (the_dataset));
-
- reader = proc_extract_active_file_data (the_dataset);
- if (!lazy_casereader_destroy (reader, lazy_serial))
- psppire_data_store_set_reader (the_data_store, reader);
-
- som_flush ();
-
- psppire_output_window_reload ();
-
- return retval;
-}
-
-
-
/* Create a deep copy of SRC */
GtkListStore *
clone_list_store (const GtkListStore *src)