Add support for reading SPSS/PC+ system files.

[pspp] / src / ui / gui / psppire.c

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 9fe010525a36f1bd775a0f9657607fcc3e173e43..5a35b52efb4a4a90ab312cabbb9e183d0c76b5e0 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -29,10 +29,8 @@
 #include "data/datasheet.h"
 #include "data/file-handle-def.h"
 #include "data/file-name.h"
-#include "data/por-file-reader.h"
 #include "data/session.h"
 #include "data/settings.h"
-#include "data/sys-file-reader.h"
 
 #include "language/lexer/lexer.h"
 #include "libpspp/i18n.h"
@@ -82,6 +80,7 @@ initialize (const char *data_file)
   preregister_widgets ();
 
   gsl_set_error_handler_off ();
+  output_engine_push ();
   settings_init ();
   fh_init ();
 
@@ -106,13 +105,13 @@ initialize (const char *data_file)
     {
       gchar *filename = local_to_filename_encoding (data_file);
 
-      enum detect_result res = any_reader_may_open (filename);
+      int retval = any_reader_detect (filename, NULL);
 
       /* Check to see if the file is a .sav or a .por file.  If not
          assume that it is a syntax file */
-      if (res == ANY_YES)
+      if (retval == 1)
        open_data_window (NULL, filename, NULL, NULL);
-      else if (res == ANY_NO)
+      else if (retval == 0)
         {
           create_data_window ();
           open_syntax_window (filename, NULL);
@@ -129,7 +128,7 @@ void
 de_initialize (void)
 {
   settings_done ();
-  output_close ();
+  output_engine_pop ();
   i18n_done ();
 }