X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fhelper.c;h=da74882a8f0bbae0557c91b3d6de82256a6e490b;hb=dde7b813c5747fba5d14e47f6dd82bb7b4dc7cf1;hp=6259965aaf3abfdd168b30ca569471f5d0f5126a;hpb=5de8102af0956488f48ae9bf4941e5867a0f1260;p=pspp

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 6259965aaf..da74882a8f 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -28,21 +28,26 @@
 #include <data/data-in.h>
 #include <data/data-out.h>
 #include <data/dictionary.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>
 
 /* Formats a value according to FORMAT
@@ -86,7 +91,7 @@ text_to_value (const gchar *text, union value *v,
     }
 
   msg_disable ();
-  ok = data_in (ss_cstr (text), format.type, 0, 0,
+  ok = data_in (ss_cstr (text), LEGACY_NATIVE, format.type, 0, 0,
                 v, fmt_var_width (&format));
   msg_enable ();
 
@@ -165,26 +170,64 @@ extern struct dataset *the_dataset;
 extern struct source_stream *the_source_stream;
 extern PsppireDataStore *the_data_store;
 
-void
+/* 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;
-
-  struct casereader *reader = psppire_data_store_get_reader (the_data_store);
-
+  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_if_fail (proc_has_active_file (the_dataset));
+  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 ( 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)
+      if ( result == CMD_EOF || result == CMD_FINISH)
 	break;
     }
 
@@ -195,17 +238,16 @@ execute_syntax (struct getl_interface *sss)
   psppire_dict_replace_dictionary (the_data_store->dict,
 				   dataset_dict (the_dataset));
 
-  {
-    PsppireCaseFile *pcf = psppire_case_file_new (dataset_source (the_dataset));
-
-    psppire_data_store_set_case_file (the_data_store, pcf);
-  }
-
-  proc_set_active_file_data (the_dataset, NULL);
+  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;
 }
 
 
@@ -255,3 +297,48 @@ marshaller_VOID__INT_INT_INT (GClosure     *closure,
             g_marshal_value_peek_int (param_values + 3),
             data2);
 }
+
+/* Create a deep copy of SRC */
+GtkListStore *
+clone_list_store (const GtkListStore *src)
+{
+  GtkTreeIter src_iter;
+  gboolean ok;
+  gint i;
+  const gint n_cols =  gtk_tree_model_get_n_columns (GTK_TREE_MODEL (src));
+  GType *types = g_malloc (sizeof (*types) *  n_cols);
+
+  int row = 0;
+  GtkListStore *dest;
+
+  for (i = 0 ; i < n_cols; ++i )
+    types[i] = gtk_tree_model_get_column_type (GTK_TREE_MODEL (src), i);
+
+  dest = gtk_list_store_newv (n_cols, types);
+
+  for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (src),
+					   &src_iter);
+       ok;
+       ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (src), &src_iter))
+    {
+      GtkTreeIter dest_iter;
+      gtk_list_store_append  (dest, &dest_iter);
+
+      for (i = 0 ; i < n_cols; ++i )
+	{
+	  GValue val = {0};
+
+	  gtk_tree_model_get_value (GTK_TREE_MODEL (src), &src_iter, i, &val);
+	  gtk_list_store_set_value (dest, &dest_iter, i, &val);
+
+	  g_value_unset (&val);
+	}
+      row++;
+    }
+
+  g_free (types);
+
+  return dest;
+}
+
+