#include <assert.h>
#include <libintl.h>
#include <gsl/gsl_errno.h>
+#include <signal.h>
+#include <argp.h>
+#include <ui/command-line.h>
#include "relocatable.h"
#include "data-editor.h"
#include "psppire.h"
+#include <libpspp/getl.h>
#include <unistd.h>
#include <data/casereader.h>
#include <data/datasheet.h>
#include <data/file-handle-def.h>
-#include <data/format.h>
#include <data/settings.h>
#include <data/file-name.h>
#include <data/procedure.h>
#include <libpspp/version.h>
#include <output/output.h>
#include <output/journal.h>
+#include <language/syntax-string-source.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "psppire-var-store.h"
#include "psppire-data-store.h"
#include "helper.h"
-#include "data-sheet.h"
-#include "var-sheet.h"
#include "message-dialog.h"
+#include <ui/syntax-gen.h>
#include "output-viewer.h"
+#include <data/sys-file-reader.h>
+#include <data/por-file-reader.h>
+
+#include <ui/source-init-opts.h>
+
PsppireDataStore *the_data_store = 0;
PsppireVarStore *the_var_store = 0;
static void
replace_casereader (struct casereader *s)
{
- PsppireCaseFile *pcf = psppire_case_file_new (s);
-
- psppire_data_store_set_case_file (the_data_store, pcf);
+ psppire_data_store_set_reader (the_data_store, s);
}
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-
void
-initialize (void)
+initialize (struct command_line_processor *clp, int argc, char **argv)
{
PsppireDict *dictionary = 0;
glade_init ();
gsl_set_error_handler_off ();
- fmt_init ();
fn_init ();
outp_init ();
settings_init (&viewer_width, &viewer_length);
the_data_store = psppire_data_store_new (dictionary);
replace_casereader (NULL);
+
+
create_icon_factory ();
outp_configure_driver_line (
journal_enable ();
textdomain (PACKAGE);
+ /* Ignore alarm clock signals */
+ signal (SIGALRM, SIG_IGN);
+
+ command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream);
+ command_line_processor_replace_aux (clp, &non_option_argp, the_source_stream);
+
+ command_line_processor_parse (clp, argc, argv);
+
new_data_window (NULL, NULL);
+
+ execute_syntax (create_syntax_string_source (""));
}
}
}
-
{
/* Create our own "pspp-stock-reset" item, using the
GTK_STOCK_REFRESH icon set */
};
- gtk_stock_add (&items, 2);
- gtk_icon_factory_add (factory, "pspp-stock-reset",
+ gtk_stock_add (items, 2);
+ gtk_icon_factory_add (factory, "pspp-stock-reset",
gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH)
);
- gtk_icon_factory_add (factory, "pspp-stock-select",
+ gtk_icon_factory_add (factory, "pspp-stock-select",
gtk_icon_factory_lookup_default (GTK_STOCK_INDEX)
);
}
gtk_icon_factory_add_default (factory);
}
+\f
+
+static error_t
+parse_non_options (int key, char *arg, struct argp_state *state)
+{
+ struct source_stream *ss = state->input;
+
+ if ( NULL == ss )
+ return 0;
+
+ switch (key)
+ {
+ case ARGP_KEY_ARG:
+ {
+ struct string syntax;
+ FILE *fp = fopen (arg, "r");
+ if (NULL == fp)
+ {
+ const int errnum = errno;
+ fprintf (state->err_stream, _("Cannot open %s: %s.\n"),
+ arg, strerror (errnum));
+ return 0;
+ }
+ if ( sfm_detect (fp))
+ {
+ ds_init_cstr (&syntax, "GET FILE=");
+ goto close;
+ }
+ rewind (fp);
+ if (pfm_detect (fp))
+ {
+ ds_init_cstr (&syntax, "IMPORT FILE=");
+ goto close;
+ }
+
+ fclose (fp);
+ msg (ME, _("%s is neither a system nor portable file"), arg);
+ break;
+
+ close:
+ fclose (fp);
+
+ syntax_gen_string (&syntax, ss_cstr (arg));
+ ds_put_cstr (&syntax, ".");
+
+ getl_append_source (ss,
+ create_syntax_string_source (ds_cstr (&syntax)),
+ GETL_BATCH,
+ ERRMODE_CONTINUE);
+
+ ds_destroy (&syntax);
+ break;
+ }
+ default:
+ return ARGP_ERR_UNKNOWN;
+ }
+ return 0;
+}
+
+
+const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0};