Rewrite PSPP output engine.

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

diff --git a/src/ui/gui/executor.c b/src/ui/gui/executor.c
index 711e9563b849f16bd973860642e52dd433a0c538..6ccb5a534deca402d8e879dd2f3f6376a13e30e3 100644 (file)
--- a/src/ui/gui/executor.c
+++ b/src/ui/gui/executor.c
@@ -23,7 +23,7 @@
 #include <libpspp/getl.h>
 #include <language/lexer/lexer.h>
 #include <language/command.h>
-#include <output/manager.h>
+#include <output/driver.h>
 #include "psppire-output-window.h"
 
 extern struct dataset *the_dataset;
@@ -45,7 +45,7 @@ execute_syntax (struct getl_interface *sss)
   gboolean retval = TRUE;
 
   struct casereader *reader;
-  size_t value_cnt;
+  const struct caseproto *proto;
   casenumber case_cnt;
   unsigned long int lazy_serial;
 
@@ -62,9 +62,9 @@ execute_syntax (struct getl_interface *sss)
      needed.  If the data store casereader is never needed, then
      it is reused the next time syntax is run, without wrapping
      it in another layer. */
-  value_cnt = psppire_data_store_get_value_count (the_data_store);
+  proto = psppire_data_store_get_proto (the_data_store);
   case_cnt = psppire_data_store_get_case_count (the_data_store);
-  reader = lazy_casereader_create (value_cnt, case_cnt,
+  reader = lazy_casereader_create (proto, case_cnt,
                                    create_casereader_from_data_store,
                                    the_data_store, &lazy_serial);
   proc_set_active_file_data (the_dataset, reader);
@@ -102,9 +102,7 @@ execute_syntax (struct getl_interface *sss)
   if (!lazy_casereader_destroy (reader, lazy_serial))
     psppire_data_store_set_reader (the_data_store, reader);
 
-  som_flush ();
-
-  psppire_output_window_reload ();
+  output_flush ();
 
   return retval;
 }