gui: For text data import, use the same parser for preview as for import.

[pspp] / src / ui / gui / psppire-delimited-text.h

diff --git a/src/ui/gui/psppire-delimited-text.h b/src/ui/gui/psppire-delimited-text.h
index 56ee8f97e52a0985ba935afc522021d45c29e6fd..c24ce10c9375d2f1c5d07efeff68eb996928a49e 100644 (file)
--- a/src/ui/gui/psppire-delimited-text.h
+++ b/src/ui/gui/psppire-delimited-text.h
@@ -18,6 +18,7 @@
 #define __PSPPIRE_DELIMITED_TEXT_H__
 
 #include "libpspp/str.h"
+#include "libpspp/string-array.h"
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -54,21 +55,23 @@ struct _PsppireDelimitedText
   GObject parent;
 
   GtkTreeModel *child;
-  
+
   /* The first line of the file to be modelled */
   gint first_line;
-  
+
   GSList *delimiters;
-  gint max_delimiters;
-  
+  gint max_fields;
+
+  gunichar quote;
+
   /*< private >*/
   gboolean dispose_has_run ;
   gint stamp;
 
   /* caching */
-  const char *cache_starts[512];
-  struct substring const_cache;
   int cache_row;
+  struct string_array cache;
+  struct data_parser *parser;
 };
 
 struct _PsppireDelimitedTextClass
@@ -81,7 +84,7 @@ typedef struct _PsppireDelimitedText       PsppireDelimitedText;
 typedef struct _PsppireDelimitedTextClass  PsppireDelimitedTextClass;
 
 GType psppire_delimited_text_get_type (void) G_GNUC_CONST;
-GtkTreeModel *psppire_delimited_text_new (GtkTreeModel *);
+PsppireDelimitedText *psppire_delimited_text_new (GtkTreeModel *);
 
 const gchar *psppire_delimited_text_get_header_title (PsppireDelimitedText *file, gint column);