X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=05a1acc4b75b5cde56bf93d68ba6c063bdab18cf;hb=f514231dd2fc0c2adc1ebab5c46a4b55d2bd9c2b;hp=84489c073c983a47b4cd033fea84b9b8c3cdc791;hpb=ee08e284e9722ddc0fb785c5f9af09bcb6fa8a47;p=pspp

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 84489c073c..05a1acc4b7 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,10 +1,9 @@
-/*
-   PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
    Copyright (C) 2004, 2005, 2006  Free Software Foundation
 
-   This program is free software; you can redistribute it and/or modify
+   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 2 of the License, or
+   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,
@@ -13,9 +12,7 @@
    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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -29,16 +26,15 @@
 #include "psppire.h"
 
 
+#include <data/casereader.h>
+#include <data/datasheet.h>
 #include <data/file-handle-def.h>
 #include <data/format.h>
-#include <data/storage-stream.h>
-#include <data/case-source.h>
 #include <data/settings.h>
 #include <data/file-name.h>
 #include <data/procedure.h>
 #include <libpspp/getl.h>
 #include <language/lexer/lexer.h>
-#include <ui/flexifile.h>
 #include <libpspp/version.h>
 
 #include <gtk/gtk.h>
@@ -50,17 +46,8 @@
 #include "data-sheet.h"
 #include "var-sheet.h"
 #include "message-dialog.h"
-#include "flexifile-factory.h"
 
 PsppireDataStore *the_data_store = 0;
-
-
-static bool parse_command_line (int *argc, char ***argv,
-				gchar **filename,
-				gboolean *show_splash,
-				GError **err);
-
-
 PsppireVarStore *the_var_store = 0;
 
 static void create_icon_factory (void);
@@ -68,36 +55,18 @@ static void create_icon_factory (void);
 struct source_stream *the_source_stream ;
 struct dataset * the_dataset = NULL;
 
-static void
-replace_dictionary (struct dictionary *d)
-{
-  psppire_dict_replace_dictionary (the_data_store->dict, d);
-}
-
 
 static void
-replace_flexifile (struct case_source *s)
+replace_casereader (struct casereader *s)
 {
-  if ( NULL == s )
-    psppire_case_file_replace_flexifile (the_data_store->case_file,
-					 (struct flexifile *) flexifile_create (0));
-  else
-    {
-      if ( ! case_source_is_class (s, &storage_source_class))
-	return ;
-
-      psppire_case_file_replace_flexifile (the_data_store->case_file,
-					   (struct flexifile *)
-					   storage_source_get_casefile (s));
-    }
-}
-
+  PsppireCaseFile *pcf = psppire_case_file_new (s);
 
+  psppire_data_store_set_case_file (the_data_store, pcf);
+}
 
 void
 initialize (void)
 {
-  struct casefile_factory *factory;
   PsppireDict *dictionary = 0;
 
   /* gtk_init messes with the locale.
@@ -113,21 +82,18 @@ initialize (void)
   fmt_init ();
   settings_init ();
   fh_init ();
-  factory = flexifile_factory_create ();
   the_source_stream =
     create_source_stream (
 			  fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
 			  );
 
-  the_dataset = create_dataset (factory,
-				replace_flexifile,
-				replace_dictionary);
+  the_dataset = create_dataset (NULL, NULL);
+
 
   message_dialog_init (the_source_stream);
 
-  dictionary = psppire_dict_new_from_dict (
-					   dataset_dict (the_dataset)
-					   );
+  dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
+
 
   bind_textdomain_codeset (PACKAGE, "UTF-8");
 
@@ -135,12 +101,9 @@ initialize (void)
   /* Create the model for the var_sheet */
   the_var_store = psppire_var_store_new (dictionary);
 
-
   the_data_store = psppire_data_store_new (dictionary);
+  replace_casereader (NULL);
 
-  proc_set_source (the_dataset,
-		   storage_source_create (the_data_store->case_file->flexifile)
-		   );
 
   create_icon_factory ();