gnue/geas/src/oql oql.c

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/12/18 16:30:12

Modified files:
        geas/src/oql   : oql.c 

Log message:
        Continued on the parser replacement.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/oql/oql.c.diff?tr1=1.72&tr2=1.73&r1=text&r2=text

Patches:
Index: gnue/geas/src/oql/oql.c
diff -c gnue/geas/src/oql/oql.c:1.72 gnue/geas/src/oql/oql.c:1.73
*** gnue/geas/src/oql/oql.c:1.72        Sat Dec 15 16:51:39 2001
--- gnue/geas/src/oql/oql.c     Tue Dec 18 16:30:12 2001
***************
*** 19,25 ****
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
!   $Id: oql.c,v 1.72 2001/12/15 21:51:39 reinhard Exp $
  */
  
  #include "config.h"
--- 19,25 ----
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
!   $Id: oql.c,v 1.73 2001/12/18 21:30:12 reinhard Exp $
  */
  
  #include "config.h"
***************
*** 27,33 ****
  #include <string.h>
  #include <ctype.h>
  #include <glib.h>
! #include "classdata.h"
  #include "geas-server.h"
  
  static _QueryData *create_query_data (const char *orderby);
--- 27,33 ----
  #include <string.h>
  #include <ctype.h>
  #include <glib.h>
! #include "classdef/classdef.h"
  #include "geas-server.h"
  
  static _QueryData *create_query_data (const char *orderby);
***************
*** 875,885 ****
                    GHashTable * values, gboolean update)
  {
    _QueryData *query;
!   odl_class *c;
    const gchar *fieldname;
    gchar *value;
-   GList *all_fields;
-   GList *field;
    _QueryCondition *condition;
  
    g_return_val_if_fail (classname, NULL);
--- 875,885 ----
                    GHashTable * values, gboolean update)
  {
    _QueryData *query;
!   geas_cd_class *c;
!   geas_cd_fieldlist *fl;
!   geas_cd_field *f;
    const gchar *fieldname;
    gchar *value;
    _QueryCondition *condition;
  
    g_return_val_if_fail (classname, NULL);
***************
*** 895,916 ****
    query->fields = g_list_append (query->fields, g_strdup ("sys_id"));
    query->values = g_list_append (query->values, g_strdup (key));
  
!   c = odl_find_class (all_classes, classname, NULL);
!   all_fields = odl_class_get_fields (c, FT_basic);
! 
!   field = g_list_first (all_fields);
!   while (field)
      {
!       fieldname = odl_field_get_name ((odl_field *) field->data);
        value = g_hash_table_lookup (values, fieldname);
        if (value)
          {
            query->fields = g_list_append (query->fields, g_strdup (fieldname));
            query->values = g_list_append (query->values, g_strdup (value));
          }
!       field = g_list_next (field);
      }
!   odl_fieldlist_free (all_fields);
  
    condition = create_query_condition (g_strdup (classname),
                                        g_strdup ("sys_id"),
--- 895,918 ----
    query->fields = g_list_append (query->fields, g_strdup ("sys_id"));
    query->values = g_list_append (query->values, g_strdup (key));
  
!   /* c = odl_find_class (all_classes, classname, NULL);
!   all_fields = odl_class_get_fields (c, FT_basic); */
!   c = geas_cd_class_find (classname);
!   fl = geas_cd_class_fieldlist_new (c);
!   f = geas_cd_fieldlist_next (fl);
!   while (f)
      {
!       fieldname = geas_cd_field_get_name (f);
!       g_message (fieldname);
        value = g_hash_table_lookup (values, fieldname);
        if (value)
          {
            query->fields = g_list_append (query->fields, g_strdup (fieldname));
            query->values = g_list_append (query->values, g_strdup (value));
          }
!       f = geas_cd_fieldlist_next (fl);
      }
!   geas_cd_fieldlist_free (fl);
  
    condition = create_query_condition (g_strdup (classname),
                                        g_strdup ("sys_id"),