[Pspp-cvs] pspp/src data/casereader.c data/procedure.c dat...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/06/15 01:24:28

Modified files:
        src/data       : casereader.c procedure.c procedure.h 
        src/ui/gui     : helper.c psppire-case-file.c 
                         psppire-case-file.h psppire-data-store.c 
                         psppire-data-store.h psppire-dict.c psppire.c 

Log message:
        Fixed procedure execution in GUI.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader.c?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/procedure.c?cvsroot=pspp&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/procedure.h?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/helper.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-case-file.c?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-case-file.h?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.c?cvsroot=pspp&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.h?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dict.c?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.43&r2=1.44

Patches:
Index: data/casereader.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/casereader.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- data/casereader.c   8 Jun 2007 04:53:47 -0000       1.3
+++ data/casereader.c   15 Jun 2007 01:24:28 -0000      1.4
@@ -97,6 +97,8 @@
 {
   struct casereader *reader = (struct casereader *) reader_;
   struct casereader *clone;
+  if ( reader == NULL ) 
+    return NULL;
 
   if (reader->class->clone == NULL)
     insert_shim (reader);

Index: data/procedure.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/procedure.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- data/procedure.c    11 Jun 2007 04:03:19 -0000      1.29
+++ data/procedure.c    15 Jun 2007 01:24:28 -0000      1.30
@@ -700,6 +700,12 @@
   return ds->dict;
 }
 
+const struct casereader *
+dataset_source (const struct dataset *ds)
+{
+  return ds->source;
+}
+
 void
 dataset_need_lag (struct dataset *ds, int n_before)
 {

Index: data/procedure.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/procedure.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- data/procedure.h    8 Jun 2007 04:53:48 -0000       1.14
+++ data/procedure.h    15 Jun 2007 01:24:28 -0000      1.15
@@ -77,6 +77,8 @@
 bool dataset_end_of_command (struct dataset *);
 
 struct dictionary *dataset_dict (const struct dataset *ds);
+const struct casereader *dataset_source (const struct dataset *ds);
+
 
 struct ccase *lagged_case (const struct dataset *ds, int n_before);
 void dataset_need_lag (struct dataset *ds, int n_before);

Index: ui/gui/helper.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/helper.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- ui/gui/helper.c     7 Jun 2007 06:42:06 -0000       1.18
+++ ui/gui/helper.c     15 Jun 2007 01:24:28 -0000      1.19
@@ -168,8 +168,13 @@
 gboolean
 execute_syntax (struct getl_interface *sss)
 {
+  gboolean status;
   struct lexer *lexer;
 
+  struct casereader *reader = psppire_data_store_get_reader (the_data_store);
+
+  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);
@@ -189,9 +194,20 @@
   lex_destroy (lexer);
 
   /* 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 proc_execute (the_dataset);
+     every script.  Otherwise commands like GET could leave the GUI
+     without a datasheet. */
+  status = proc_execute (the_dataset);
+
+  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);
+  }
+
+  return status;
 }
 
 

Index: ui/gui/psppire-case-file.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-case-file.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- ui/gui/psppire-case-file.c  14 Jun 2007 14:21:23 -0000      1.21
+++ ui/gui/psppire-case-file.c  15 Jun 2007 01:24:28 -0000      1.22
@@ -28,6 +28,7 @@
 #include <data/case.h>
 #include <data/data-in.h>
 #include <data/datasheet.h>
+#include <data/casereader.h>
 #include <math/sort.h>
 #include <libpspp/misc.h>
 
@@ -93,7 +94,7 @@
   object_class->finalize = psppire_case_file_finalize;
 
   signals [CASE_CHANGED] =
-    g_signal_new ("case_changed",
+    g_signal_new ("case-changed",
                  G_TYPE_FROM_CLASS (class),
                  G_SIGNAL_RUN_FIRST,
                  0,
@@ -105,7 +106,7 @@
 
 
   signals [CASE_INSERTED] =
-    g_signal_new ("case_inserted",
+    g_signal_new ("case-inserted",
                  G_TYPE_FROM_CLASS (class),
                  G_SIGNAL_RUN_FIRST,
                  0,
@@ -117,7 +118,7 @@
 
 
   signals [CASES_DELETED] =
-    g_signal_new ("cases_deleted",
+    g_signal_new ("cases-deleted",
                  G_TYPE_FROM_CLASS (class),
                  G_SIGNAL_RUN_FIRST,
                  0,
@@ -154,11 +155,11 @@
  * Creates a new #PsppireCaseFile.
  */
 PsppireCaseFile*
-psppire_case_file_new (struct casereader *reader)
+psppire_case_file_new (const struct casereader *reader)
 {
   PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL);
 
-  cf->datasheet = datasheet_create (reader);
+  cf->datasheet = datasheet_create (casereader_clone (reader));
   cf->accessible = TRUE;
 
   return cf;
@@ -320,7 +321,7 @@
   if (ok)
     g_signal_emit (cf, signals [CASE_CHANGED], 0, casenum);
 
-  freesa (value);
+  freea (value);
 
   return TRUE;
 }

Index: ui/gui/psppire-case-file.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-case-file.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ui/gui/psppire-case-file.h  12 Jun 2007 01:59:00 -0000      1.13
+++ ui/gui/psppire-case-file.h  15 Jun 2007 01:24:28 -0000      1.14
@@ -70,7 +70,7 @@
 /* -- PsppireCaseFile --- */
 GType          psppire_case_file_get_type (void);
 
-PsppireCaseFile *psppire_case_file_new (struct casereader *);
+PsppireCaseFile *psppire_case_file_new (const struct casereader *);
 
 gboolean psppire_case_file_insert_case (PsppireCaseFile *cf, struct ccase *c, 
gint row);
 
@@ -105,6 +105,10 @@
 gboolean psppire_case_file_get_case (const PsppireCaseFile *cf, gint casenum,
                                    struct ccase *c);
 
+
+struct casereader * psppire_case_file_make_reader (PsppireCaseFile *cf);
+
+
 G_END_DECLS
 
 #endif /* __PSPPIRE_CASE_FILE_H__ */

Index: ui/gui/psppire-data-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- ui/gui/psppire-data-store.c 12 Jun 2007 01:59:00 -0000      1.36
+++ ui/gui/psppire-data-store.c 15 Jun 2007 01:24:28 -0000      1.37
@@ -686,6 +686,18 @@
 
 
 
+/* Return a casereader made from this datastore */
+struct casereader *
+psppire_data_store_get_reader (PsppireDataStore *ds)
+{
+  struct casereader *reader ;
+
+  reader = psppire_case_file_make_reader (ds->case_file);
+
+  return reader;
+}
+
+
 
 /* Column related funcs */
 
@@ -850,3 +862,5 @@
   iface->get_button_label = geometry_get_row_button_label;
 }
 
+
+

Index: ui/gui/psppire-data-store.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ui/gui/psppire-data-store.h 12 Jun 2007 01:59:00 -0000      1.9
+++ ui/gui/psppire-data-store.h 15 Jun 2007 01:24:28 -0000      1.10
@@ -106,6 +106,9 @@
 gboolean psppire_data_store_insert_new_case (PsppireDataStore *ds, gint posn);
 
 
+struct casereader * psppire_data_store_get_reader (PsppireDataStore *ds);
+
+
 
 #ifdef __cplusplus
 }

Index: ui/gui/psppire-dict.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dict.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- ui/gui/psppire-dict.c       30 Jan 2007 11:22:09 -0000      1.28
+++ ui/gui/psppire-dict.c       15 Jun 2007 01:24:28 -0000      1.29
@@ -290,6 +290,8 @@
   filter_changed_callback (d, var ? var_get_dict_index (var) : -1, dict);
 
   split_changed_callback (d, dict);
+
+  dict_set_callbacks (dict->dict, &gui_callbacks, dict);
 }
 
 

Index: ui/gui/psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- ui/gui/psppire.c    12 Jun 2007 01:59:01 -0000      1.43
+++ ui/gui/psppire.c    15 Jun 2007 01:24:28 -0000      1.44
@@ -58,12 +58,6 @@
 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)
@@ -96,9 +90,7 @@
                          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);