X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=c322321db60cb84621d3b44c6150a354c2b29e93;hb=2bdde1cd21cd58349cf4bd852fddf40524854288;hp=bd6e2198f4efc7ca276dc2b04cc79645e4338534;hpb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;p=pspp-builds.git

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index bd6e2198..c322321d 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,28 +1,52 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2007  Free Software Foundation
+
+   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 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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, see <http://www.gnu.org/licenses/>. */
+
+
 /* This file is a rubbish bin where stuff gets put when it doesn't seem to
    belong anywhere else.
 */
 #include <config.h>
 
+#include	<glib-object.h>
+
 #include <glib.h>
 #include "helper.h"
 #include "message-dialog.h"
 #include <data/data-in.h>
 #include <data/data-out.h>
 #include <data/dictionary.h>
-#include <data/storage-stream.h>
+#include <data/casereader-provider.h>
 #include <libpspp/message.h>
 
 #include <libpspp/i18n.h>
 
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
 #include <data/settings.h>
 
 #include <language/command.h>
+#include <data/lazy-casereader.h>
 #include <data/procedure.h>
 #include <language/lexer/lexer.h>
 #include "psppire-data-store.h"
+#include <output/manager.h>
+#include "output-viewer.h"
 
+#include "xalloc.h"
 
 #include <gettext.h>
 
@@ -85,7 +109,7 @@ get_widget_assert (GladeXML *xml, const gchar *name)
   w = glade_xml_get_widget (xml, name);
 
   if ( !w )
-    g_warning ("Widget \"%s\" could not be found\n", name);
+    g_critical ("Widget \"%s\" could not be found\n", name);
 
   return w;
 }
@@ -146,22 +170,64 @@ extern struct dataset *the_dataset;
 extern struct source_stream *the_source_stream;
 extern PsppireDataStore *the_data_store;
 
+/* Lazy casereader callback function used by execute_syntax. */
+static struct casereader *
+create_casereader_from_data_store (void *data_store_)
+{
+  PsppireDataStore *data_store = data_store_;
+  return psppire_data_store_get_reader (data_store);
+}
+
 gboolean
 execute_syntax (struct getl_interface *sss)
 {
   struct lexer *lexer;
-
-  g_return_val_if_fail (proc_has_source (the_dataset), FALSE);
+  gboolean retval = TRUE;
+
+  struct casereader *reader;
+  size_t value_cnt;
+  casenumber case_cnt;
+  unsigned long int lazy_serial;
+
+  /* When the user executes a number of snippets of syntax in a
+     row, none of which read from the active file, the GUI becomes
+     progressively less responsive.  The reason is that each syntax
+     execution encapsulates the active file data in another
+     datasheet layer.  The cumulative effect of having a number of
+     layers of datasheets wastes time and space.
+
+     To solve the problem, we use a "lazy casereader", a wrapper
+     around the casereader obtained from the data store, that
+     only actually instantiates that casereader when it is
+     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);
+  case_cnt = psppire_data_store_get_case_count (the_data_store);
+  reader = lazy_casereader_create (value_cnt, case_cnt,
+                                   create_casereader_from_data_store,
+                                   the_data_store, &lazy_serial);
+  proc_set_active_file_data (the_dataset, reader);
+
+  g_return_val_if_fail (proc_has_active_file (the_dataset), FALSE);
 
   lexer = lex_create (the_source_stream);
 
-  getl_append_source (the_source_stream, sss);
+  getl_append_source (the_source_stream, sss, GETL_BATCH, ERRMODE_CONTINUE);
 
   for (;;)
     {
-      int result = cmd_parse (lexer, the_dataset);
+      enum cmd_result result = cmd_parse (lexer, the_dataset);
 
-      if (result == CMD_EOF || result == CMD_FINISH)
+      if ( cmd_result_is_failure (result))
+	{
+	  retval = FALSE;
+	  if ( source_stream_current_error_mode (the_source_stream)
+	       == ERRMODE_STOP )
+	    break;
+	}
+
+      if ( result == CMD_EOF || result == CMD_FINISH)
 	break;
     }
 
@@ -169,18 +235,65 @@ execute_syntax (struct getl_interface *sss)
 
   lex_destroy (lexer);
 
-  /* The GUI must *always* have a data source, even if it's an empty one.
-     Therefore, we find that there is none, (for example NEW FILE was the last
-     item in the syntax) then we create a new one. */
-  if ( ! proc_has_source (the_dataset))
-    proc_set_source (the_dataset,
-		     storage_source_create (the_data_store->case_file->flexifile)
-		     );
-
-  /* GUI syntax needs this implicit EXECUTE command at the end of
-     every script.  Otherwise commands like GET could leave the GUI without
-     a casefile. */
-  return procedure (the_dataset, NULL, NULL);
+  psppire_dict_replace_dictionary (the_data_store->dict,
+				   dataset_dict (the_dataset));
+
+  reader = proc_extract_active_file_data (the_dataset);
+  if (!lazy_casereader_destroy (reader, lazy_serial))
+    psppire_data_store_set_case_file (the_data_store,
+                                      psppire_case_file_new (reader));
+
+  som_flush ();
+
+  reload_the_viewer ();
+
+  return retval;
 }
 
 
+
+#ifdef G_ENABLE_DEBUG
+# define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#else
+# define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#endif
+
+
+/* VOID:INT,INT,INT */
+void
+marshaller_VOID__INT_INT_INT (GClosure     *closure,
+                        GValue       *return_value,
+                        guint         n_param_values,
+                        const GValue *param_values,
+                        gpointer      invocation_hint,
+                        gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_INT_INT) (gpointer     data1,
+						  gint         arg_1,
+						  gint         arg_2,
+						  gint         arg_3,
+						  gpointer     data2);
+  register GMarshalFunc_VOID__INT_INT_INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_INT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            g_marshal_value_peek_int (param_values + 3),
+            data2);
+}