X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ffind-dialog.c;h=11ec0603d4dfd98ee65954b1fed34af49feb4bc2;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=985e73fbc321f8dc5793a2dab193f4edc634a19a;hpb=a992bf1121d3e1eef76fd6184b95fe079bb91558;p=pspp-builds.git

diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c
index 985e73fb..11ec0603 100644
--- a/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 2009  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
@@ -24,7 +24,7 @@ which match particular strings */
 #include "psppire-selector.h"
 #include "psppire-dialog.h"
 #include "helper.h"
-#include "data-editor.h"
+#include "psppire-data-window.h"
 #include "dict-display.h"
 #include <data/value.h>
 #include <data/format.h>
@@ -54,7 +54,7 @@ struct find_dialog
   GtkBuilder *xml;
   PsppireDict *dict;
   struct datasheet *data;
-  struct data_editor *de;
+  PsppireDataWindow *de;
   GtkWidget *variable_entry;
   GtkWidget *value_entry;
   GtkWidget *value_labels_checkbox;
@@ -185,7 +185,7 @@ value_labels_toggled (GtkToggleButton *tb, gpointer data)
 void
 find_dialog (GObject *o, gpointer data)
 {
-  struct data_editor *de = data;
+  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   struct find_dialog fd;
 
@@ -199,7 +199,7 @@ find_dialog (GObject *o, gpointer data)
   PsppireVarStore *vs ;
   PsppireDataStore *ds ;
 
-  fd.xml = builder_new ("psppire.ui");
+  fd.xml = builder_new ("find.ui");
   fd.de = de;
 
   find_button = gtk_button_new_from_stock  (GTK_STOCK_FIND);
@@ -219,7 +219,8 @@ find_dialog (GObject *o, gpointer data)
 		"data-store", &ds,
 		NULL);
 
-  fd.dict = vs->dict;
+  g_object_get (vs, "dictionary", &fd.dict, NULL);
+
   fd.data = ds->datasheet;
 
   fd.variable_entry        = get_widget_assert (fd.xml, "find-variable-entry");
@@ -238,13 +239,12 @@ find_dialog (GObject *o, gpointer data)
 
 
 
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
 
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
-				 fd.dict,
-				 GTK_SELECTION_SINGLE,
-				 NULL);
+  g_object_set (source, "dictionary", fd.dict,
+	"selection-mode", GTK_SELECTION_SINGLE,
+	NULL);
 
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
 				 source,
@@ -286,7 +286,7 @@ forward (casenumber *i, struct datasheet *data UNUSED)
 static void
 forward_wrap (casenumber *i, struct datasheet *data)
 {
-  if ( ++*i >=  datasheet_get_row_cnt (data) ) *i = 0;
+  if ( ++*i >=  datasheet_get_n_rows (data) ) *i = 0;
 }
 
 static void
@@ -300,7 +300,7 @@ static void
 backward_wrap (casenumber *i, struct datasheet *data)
 {
   if ( --*i < 0 )
-    *i = datasheet_get_row_cnt (data) - 1;
+    *i = datasheet_get_n_rows (data) - 1;
 }
 
 
@@ -345,7 +345,7 @@ cm1c (casenumber current, struct datasheet *data)
 static casenumber
 last (casenumber current, struct datasheet *data)
 {
-  return datasheet_get_row_cnt (data) ;
+  return datasheet_get_n_rows (data) ;
 }
 
 static casenumber
@@ -428,6 +428,7 @@ struct comparator
 {
   const struct variable *var;
   enum string_cmp_flags flags;
+  const PsppireDict *dict;
 
   bool (*compare) (const struct comparator *,
 		   const union value *);
@@ -440,7 +441,7 @@ struct comparator
 struct value_comparator
 {
   struct comparator parent;
-  union value *pattern;
+  union value pattern;
 };
 
 /* A comparator which matches string values or parts thereof */
@@ -463,7 +464,7 @@ value_compare (const struct comparator *cmptr,
 	       const union value *v)
 {
   const struct value_comparator *vc = (const struct value_comparator *) cmptr;
-  return 0 == value_compare_3way (v, vc->pattern, var_get_width (cmptr->var));
+  return 0 == value_compare_3way (v, &vc->pattern, var_get_width (cmptr->var));
 }
 
 
@@ -493,20 +494,24 @@ static bool
 string_value_compare (const struct comparator *cmptr,
 		      const union value *val)
 {
+  bool found;
+  char *text;
   const struct string_comparator *ssc =
     (const struct string_comparator *) cmptr;
 
-  const char *text = val->s;
   int width = var_get_width (cmptr->var);
-
+  g_return_val_if_fail (width > 0, false);
   assert ( ! (cmptr->flags & STR_CMP_LABELS));
 
-  g_return_val_if_fail (width > 0, false);
+  text = value_to_text (*val, cmptr->dict, *var_get_write_format (cmptr->var));
 
   if ( cmptr->flags & STR_CMP_SUBSTR)
-    return (NULL != g_strstr_len (text, width, ssc->pattern));
+    found =  (NULL != g_strstr_len (text, width, ssc->pattern));
   else
-    return (0 == strncmp (text, ssc->pattern, width));
+    found = (0 == strncmp (text, ssc->pattern, width));
+
+  free (text);
+  return found;
 }
 
 
@@ -527,9 +532,9 @@ regexp_value_compare (const struct comparator *cmptr,
 
   g_return_val_if_fail (width > 0, false);
 
+  text = value_to_text (*val, cmptr->dict, *var_get_write_format (cmptr->var));
   /* We must remove trailing whitespace, otherwise $ will not match where
      one would expect */
-  text = g_strndup (val->s, width);
   g_strchomp (text);
 
   retval = (0 == regexec (&rec->re, text, 0, 0, 0));
@@ -571,46 +576,33 @@ regexp_destroy (struct comparator *cmptr)
 }
 
 static void
-value_destroy (struct comparator *cmptr)
+cmptr_value_destroy (struct comparator *cmptr)
 {
   struct value_comparator *vc = (struct value_comparator *) cmptr;
-  free (vc->pattern);
+  value_destroy (&vc->pattern, var_get_width (cmptr->var));
 }
 
 
 static struct comparator *
-value_comparator_create (const struct variable *var, const char *target)
+value_comparator_create (const struct variable *var, const PsppireDict *dict, const char *target)
 {
-  const struct fmt_spec *fmt;
-  int width ;
   struct value_comparator *vc = xzalloc (sizeof (*vc));
   struct comparator *cmptr = (struct comparator *) vc;
 
   cmptr->flags = 0;
   cmptr->var = var;
   cmptr->compare  = value_compare ;
-  cmptr->destroy = value_destroy;
-
-  width = var_get_width (var);
-  fmt = var_get_write_format (var);
-
-  vc->pattern = value_create (width);
+  cmptr->destroy = cmptr_value_destroy;
+  cmptr->dict = dict;
 
-  if ( ! data_in (ss_cstr (target),
-                  LEGACY_NATIVE,
-		  fmt->type,
-		  0, 0, 0,
-		  vc->pattern, width) )
-    {
-      free (vc);
-      return NULL;
-    }
+  text_to_value (target, dict, var, &vc->pattern);
 
   return cmptr;
 }
 
 static struct comparator *
-string_comparator_create (const struct variable *var, const char *target,
+string_comparator_create (const struct variable *var, const PsppireDict *dict, 
+			  const char *target,
 			  enum string_cmp_flags flags)
 {
   struct string_comparator *ssc = xzalloc (sizeof (*ssc));
@@ -618,6 +610,7 @@ string_comparator_create (const struct variable *var, const char *target,
 
   cmptr->flags = flags;
   cmptr->var = var;
+  cmptr->dict = dict;
 
   if ( flags & STR_CMP_LABELS)
     cmptr->compare = string_label_compare;
@@ -631,7 +624,7 @@ string_comparator_create (const struct variable *var, const char *target,
 
 
 static struct comparator *
-regexp_comparator_create (const struct variable *var, const char *target,
+regexp_comparator_create (const struct variable *var, const PsppireDict *dict, const char *target,
 			  enum string_cmp_flags flags)
 {
   int code;
@@ -640,6 +633,7 @@ regexp_comparator_create (const struct variable *var, const char *target,
 
   cmptr->flags = flags;
   cmptr->var = var;
+  cmptr->dict = dict;
   cmptr->compare  = (flags & STR_CMP_LABELS)
     ? regexp_label_compare : regexp_value_compare ;
 
@@ -689,16 +683,16 @@ comparator_destroy (struct comparator *cmptr)
 
 
 static struct comparator *
-comparator_factory (const struct variable *var, const char *str,
+comparator_factory (const struct variable *var, const PsppireDict *dict, const char *str,
 		    enum string_cmp_flags flags)
 {
   if ( flags & STR_CMP_REGEXP )
-    return regexp_comparator_create (var, str, flags);
+    return regexp_comparator_create (var, dict, str, flags);
 
   if ( flags & (STR_CMP_SUBSTR | STR_CMP_LABELS) )
-    return string_comparator_create (var, str, flags);
+    return string_comparator_create (var, dict, str, flags);
 
-  return value_comparator_create (var, str);
+  return value_comparator_create (var, dict, str);
 }
 
 
@@ -740,12 +734,13 @@ find_value (const struct find_dialog *fd, casenumber current_row,
     flags |= STR_CMP_LABELS;
 
   {
-    union value *val = value_create (width);
+    union value val;
     casenumber i;
     const struct casenum_iterator *ip = get_iteration_params (fd);
     struct comparator *cmptr =
-      comparator_factory (var, target_string, flags);
+      comparator_factory (var, fd->dict, target_string, flags);
 
+    value_init (&val, width);
     if ( ! cmptr)
       goto finish;
 
@@ -753,10 +748,9 @@ find_value (const struct find_dialog *fd, casenumber current_row,
 	 i != ip->end (current_row, fd->data);
 	 ip->next (&i, fd->data))
       {
-	datasheet_get_value (fd->data, i, var_get_case_index (var),
-			     val, width);
+	datasheet_get_value (fd->data, i, var_get_case_index (var), &val);
 
-	if ( comparator_compare (cmptr, val))
+	if ( comparator_compare (cmptr, &val))
 	  {
 	    *row = i;
 	    break;
@@ -765,6 +759,6 @@ find_value (const struct find_dialog *fd, casenumber current_row,
 
   finish:
     comparator_destroy (cmptr);
-    free (val);
+    value_destroy (&val, width);
   }
 }