Added a basic output viewer.

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

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 06b1488762f9ba195e98210291b9041619996b51..0c60fbd2412f90ba360c5d6d753507a304fedc68 100644 (file)
--- 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>
 
@@ -25,10 +22,9 @@
 #include "relocatable.h"
 
 #include "data-editor.h"
-
 #include "psppire.h"
 
-
+#include <unistd.h>
 #include <data/casereader.h>
 #include <data/datasheet.h>
 #include <data/file-handle-def.h>
@@ -39,6 +35,7 @@
 #include <libpspp/getl.h>
 #include <language/lexer/lexer.h>
 #include <libpspp/version.h>
+#include <output/output.h>
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
@@ -50,6 +47,8 @@
 #include "var-sheet.h"
 #include "message-dialog.h"
 
+#include "output-viewer.h"
+
 PsppireDataStore *the_data_store = 0;
 PsppireVarStore *the_var_store = 0;
 
@@ -58,12 +57,6 @@ 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_casereader (struct casereader *s)
@@ -89,6 +82,8 @@ initialize (void)
   glade_init ();
 
   fmt_init ();
+  fn_init ();
+  outp_init ();
   settings_init ();
   fh_init ();
   the_source_stream =
@@ -96,28 +91,31 @@ initialize (void)
                          fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
                          );
 
-  the_dataset = create_dataset (replace_casereader,
-                               replace_dictionary);
-
+  the_dataset = create_dataset (NULL, NULL);
 
 
   message_dialog_init (the_source_stream);
 
   dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
 
-
   bind_textdomain_codeset (PACKAGE, "UTF-8");
 
-
   /* 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);
 
-
   create_icon_factory ();
 
+  outp_configure_driver_line (
+    ss_cstr ("gui:ascii:screen:squeeze=on headers=off top-margin=0 "
+             "bottom-margin=0 paginate=off length=50 "
+            "width=" OUTPUT_LINE_WIDTH_str " emphasis=none "
+             "output-file=\"" OUTPUT_FILE_NAME "\" append=yes"));
+
+  unlink (OUTPUT_FILE_NAME);
+
   new_data_window (NULL, NULL);
 }
 
@@ -128,6 +126,7 @@ de_initialize (void)
   destroy_source_stream (the_source_stream);
   message_dialog_done ();
   settings_done ();
+  outp_done ();
 }