Added abstract factory to create casefiles. Updated procedures to use

[pspp-builds.git] / src / ui / gui / psppire.c

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 6dd41b34156e82884bc7bfbb290749f2ee54913a..ed4c790b95a38797dbbe8e730ffa9cfa1c9b0fe4 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,7 +1,6 @@
 /* 
    PSPPIRE --- A Graphical User Interface for PSPP
    Copyright (C) 2004, 2005, 2006  Free Software Foundation
-   Written by John Darrington
 
    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
@@ -23,11 +22,16 @@
 #include <assert.h>
 #include <libintl.h>
 
+
 #include <libpspp/version.h>
 #include <libpspp/copyleft.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/getl.h>
+#include <language/lexer/lexer.h>
 
 #include <getopt.h>
 #include <gtk/gtk.h>
@@ -41,6 +45,7 @@
 #include "data-sheet.h"
 #include "var-sheet.h"
 #include "message-dialog.h"
+#include "flexifile-factory.h"
 
 GladeXML *xml;
 
@@ -77,9 +82,15 @@ PsppireVarStore *var_store = 0;
 
 void create_icon_factory (void);
 
+struct source_stream *the_source_stream ;
+struct lexer *the_lexer;
+struct dataset * the_dataset = NULL;
+
+
 int 
 main(int argc, char *argv[]) 
 {
+  struct casefile_factory *factory;
 
   GtkWidget *data_editor ;
   GtkSheet *var_sheet ; 
@@ -116,10 +127,22 @@ main(int argc, char *argv[])
 
   fmt_init();
   settings_init();
-  getl_initialize ();
-  message_dialog_init();
+  fh_init ();
+  factory = flexifile_factory_create ();
+  the_source_stream = create_source_stream (
+                         fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
+                         );
+
+  the_lexer = lex_create (the_source_stream);
 
-  the_dictionary = psppire_dict_new();
+  the_dataset = create_dataset (factory);
+
+  message_dialog_init (the_source_stream);
+
+  the_dictionary =
+    psppire_dict_new_from_dict (
+                               dataset_dict (the_dataset)
+                               );
 
   bind_textdomain_codeset(PACKAGE, "UTF-8");
 
@@ -136,7 +159,7 @@ main(int argc, char *argv[])
   if ( !xml ) return 1;
 
   data_editor = get_widget_assert(xml, "data_editor");
-  gtk_window_set_icon_from_file(GTK_WINDOW(data_editor), 
+  gtk_window_set_icon_from_file(GTK_WINDOW(data_editor),
                                PKGDATADIR "/psppicon.png",0);
 
   /* connect the signals in the interface */
@@ -146,7 +169,7 @@ main(int argc, char *argv[])
   data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
 
   gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store));
-  
+
   gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store));
 
   if (filename)
@@ -168,7 +191,7 @@ main(int argc, char *argv[])
   /* start the event loop */
   gtk_main();
 
-  getl_uninitialize ();
+  destroy_source_stream (the_source_stream);
   message_dialog_done();
 
   settings_done();