gnue/geas doc/dia/dependencies.dia src/connecti...

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/06/08 15:42:43

Modified files:
        geas/doc/dia   : dependencies.dia 
        geas/src       : connection.c dataobject.c objectlist.c 
        geas/src/methods: methods.h 
        geas/src/objectcache: objectcache.c 
        geas/src/objectstore: objectstore.c 
        geas/src/oql   : Makefile.am oql.c oql.h 
Removed files:
        geas/src/oql   : oql_internal.h 

Log message:
        removed configuration dependency from oql module

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/doc/dia/dependencies.dia.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/connection.c.diff?cvsroot=OldCVS&tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/dataobject.c.diff?cvsroot=OldCVS&tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectlist.c.diff?cvsroot=OldCVS&tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.h.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectcache/objectcache.c.diff?cvsroot=OldCVS&tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectstore/objectstore.c.diff?cvsroot=OldCVS&tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/oql/Makefile.am.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/oql/oql.c.diff?cvsroot=OldCVS&tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/oql/oql.h.diff?cvsroot=OldCVS&tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: gnue/geas/doc/dia/dependencies.dia
Index: gnue/geas/src/connection.c
diff -u gnue/geas/src/connection.c:1.58 gnue/geas/src/connection.c:1.59
--- gnue/geas/src/connection.c:1.58     Thu Jun  7 11:43:23 2001
+++ gnue/geas/src/connection.c  Fri Jun  8 15:42:42 2001
@@ -20,7 +20,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
    
-   $Id: connection.c,v 1.58 2001/06/07 18:43:23 ntiffin Exp $
+   $Id: connection.c,v 1.59 2001/06/08 22:42:42 reinhard Exp $
  
 */
 
@@ -430,7 +430,7 @@
     }
 
   q =
-    oql_objects_field_search (configdata, classname, fieldname, searchvalue);
+    oql_objects_field_search (classname, fieldname, searchvalue);
   if (!q)
     {
       message (__PRETTY_FUNCTION__ " 1");
@@ -471,7 +471,7 @@
       return (CORBA_OBJECT_NIL);
     }
 
-  q = oql_find_all_objects (configdata, classname);
+  q = oql_find_all_objects (classname);
   if (!q)
     {
       make_ServerError_exception (ev, "Could not create query");
@@ -520,7 +520,7 @@
   /* printf( "load %s where %s.%s = %s\n" , classname , classname , fieldname
      , searchvalue ); */
   q =
-    oql_objects_field_search (configdata, classname, fieldname, searchvalue);
+    oql_objects_field_search (classname, fieldname, searchvalue);
   if (!q)
     {
       message (__PRETTY_FUNCTION__ " 3");
@@ -891,7 +891,7 @@
   temp = NULL;
 
   /* make basic query */
-  q = oql_load_object (configdata, odl_class_get_full_name (c));
+  q = oql_load_object (odl_class_get_full_name (c));
   if (!q)
     goto error;
 
@@ -1019,7 +1019,7 @@
   g_free (tmp);
 
   /* read fields */
-  query2 = oql_load_object (configdata, "geas::searchfield");
+  query2 = oql_load_object ("geas::searchfield");
   do_oql_add_query_constraint (query2, "geas::searchfield", "constraint", "=",
                                queryid, q_hackish, TRUE);
   result = query_objectstore (query2, NULL, NULL);
@@ -1078,7 +1078,7 @@
 
   /* display */
   /* printf( "Load %s WHERE \n" , odl_class_get_full_name(c) ); */
-  query = oql_load_object (configdata, odl_class_get_full_name (c));
+  query = oql_load_object (odl_class_get_full_name (c));
   if (!query)
     goto error;
 
Index: gnue/geas/src/dataobject.c
diff -u gnue/geas/src/dataobject.c:1.53 gnue/geas/src/dataobject.c:1.54
--- gnue/geas/src/dataobject.c:1.53     Sat Jun  2 06:17:10 2001
+++ gnue/geas/src/dataobject.c  Fri Jun  8 15:42:42 2001
@@ -20,7 +20,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
    
-   $Id: dataobject.c,v 1.53 2001/06/02 13:17:10 ntiffin Exp $
+   $Id: dataobject.c,v 1.54 2001/06/08 22:42:42 reinhard Exp $
    
 */
 
@@ -456,7 +456,7 @@
       loadclass = (char *)odl_field_get_sourceclass( f );
 
       /* create query */
-      q = create_base_query(configdata,loadclass);
+      q = create_base_query (loadclass);
       if (!q)
        {
           make_ServerError_exception(ev, "Could not create query");
@@ -575,7 +575,7 @@
       loadclass = (char *)odl_field_get_sourceclass( f );
 
       /* create query */
-      q = create_base_query(configdata,loadclass );
+      q = create_base_query (loadclass);
       if (!q)
        {
           make_ServerError_exception(ev, "Could not create query");
Index: gnue/geas/src/methods/methods.h
diff -u gnue/geas/src/methods/methods.h:1.6 gnue/geas/src/methods/methods.h:1.7
--- gnue/geas/src/methods/methods.h:1.6 Fri Jun  8 14:26:45 2001
+++ gnue/geas/src/methods/methods.h     Fri Jun  8 15:42:42 2001
@@ -19,12 +19,13 @@
   along with GEAS; if not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-  $Id: methods.h,v 1.6 2001/06/08 21:26:45 baumannd Exp $
+  $Id: methods.h,v 1.7 2001/06/08 22:42:42 reinhard Exp $
 */
 
 #ifndef METHODS_H
 #define METHODS_H
 
+#include "config/configuration.h"
 #include "geas-skeleton.h"
 
 /* TODO: this section will need significant changes for dynamic loading of
Index: gnue/geas/src/objectcache/objectcache.c
diff -u gnue/geas/src/objectcache/objectcache.c:1.47 
gnue/geas/src/objectcache/objectcache.c:1.48
--- gnue/geas/src/objectcache/objectcache.c:1.47        Thu Jun  7 12:51:53 2001
+++ gnue/geas/src/objectcache/objectcache.c     Fri Jun  8 15:42:42 2001
@@ -20,7 +20,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
    
-   $Id: objectcache.c,v 1.47 2001/06/07 19:51:53 ntiffin Exp $
+   $Id: objectcache.c,v 1.48 2001/06/08 22:42:42 reinhard Exp $
  
 */
 
@@ -233,7 +233,7 @@
       return (obj);
     }
   /* not in cache, so load from database */
-  q = oql_load_object_by_key (configdata, classname, key);
+  q = oql_load_object_by_key (classname, key);
   if (q)
     {
       obj = oc_objectstore_query_to_objectcache (q);
@@ -523,8 +523,8 @@
     {
     case FT_basic:
       /* basic field in this class - attempt to reload it */
-      q = oql_load_object_field_by_key (configdata, object->classname,
-                                        fieldname, object->key);
+      q = oql_load_object_field_by_key (object->classname, fieldname,
+                                        object->key);
       if (q)
         {
           object = oc_objectstore_query_to_objectcache (q);
@@ -556,7 +556,7 @@
         /* int idfield; */
         /* struct query_result *result; */
 
-        q = create_base_query (configdata, loadclass);
+        q = create_base_query (loadclass);
         if (!q)
           {
             return (NULL);
Index: gnue/geas/src/objectlist.c
diff -u gnue/geas/src/objectlist.c:1.22 gnue/geas/src/objectlist.c:1.23
--- gnue/geas/src/objectlist.c:1.22     Thu Jun  7 07:41:43 2001
+++ gnue/geas/src/objectlist.c  Fri Jun  8 15:42:42 2001
@@ -20,7 +20,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
    
-   $Id: objectlist.c,v 1.22 2001/06/07 14:41:43 ntiffin Exp $
+   $Id: objectlist.c,v 1.23 2001/06/08 22:42:42 reinhard Exp $
  
 */
 
@@ -157,7 +157,7 @@
       classname = oc_get_object_field (ob, "classname");
 
       /* create query */
-      q = oql_load_object (configdata, "geas::listitem");
+      q = oql_load_object ("geas::listitem");
       if (!q)
         {
           make_ServerError_exception (ev, "Could not create query");
@@ -338,7 +338,7 @@
 
   /* find specific list entry */
   /* create query */
-  q = oql_load_object (configdata, "geas::listitem");
+  q = oql_load_object ("geas::listitem");
   if (!q)
     {
       CORBA_free (classname);
@@ -397,7 +397,7 @@
     {
       /* find object */
       /* create query */
-      q = oql_load_object (configdata, "geas::listitem");
+      q = oql_load_object ("geas::listitem");
       if (!q)
         {
           make_ServerError_exception (ev, "Could not create query");
Index: gnue/geas/src/objectstore/objectstore.c
diff -u gnue/geas/src/objectstore/objectstore.c:1.63 
gnue/geas/src/objectstore/objectstore.c:1.64
--- gnue/geas/src/objectstore/objectstore.c:1.63        Wed Jun  6 16:45:33 2001
+++ gnue/geas/src/objectstore/objectstore.c     Fri Jun  8 15:42:43 2001
@@ -19,7 +19,7 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: objectstore.c,v 1.63 2001/06/06 23:45:33 ntiffin Exp $
+   $Id: objectstore.c,v 1.64 2001/06/08 22:42:43 reinhard Exp $
 */
 
 #include "config.h"
@@ -771,7 +771,7 @@
 
       display_objectstore_status ();
 
-      query = oql_find_all_objects (configdata, "test");
+      query = oql_find_all_objects ("test");
       if (!query)
         {
           /* TODO */
@@ -815,4 +815,4 @@
 }
 
 #endif
-/* end of self test */
\ No newline at end of file
+/* end of self test */
Index: gnue/geas/src/oql/Makefile.am
diff -u gnue/geas/src/oql/Makefile.am:1.4 gnue/geas/src/oql/Makefile.am:1.5
--- gnue/geas/src/oql/Makefile.am:1.4   Fri May 25 16:46:22 2001
+++ gnue/geas/src/oql/Makefile.am       Fri Jun  8 15:42:43 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.4 2001/05/25 23:46:22 reinhard Exp $
+## $Id: Makefile.am,v 1.5 2001/06/08 22:42:43 reinhard Exp $
 
 noinst_LIBRARIES = liboql.a
 
@@ -6,4 +6,4 @@
            -I$(top_srcdir)/lib/classdefs \
            -I$(top_srcdir)/src
 
-liboql_a_SOURCES = oql.c oql.h oql_internal.h
+liboql_a_SOURCES = oql.c oql.h
Index: gnue/geas/src/oql/oql.c
diff -u gnue/geas/src/oql/oql.c:1.59 gnue/geas/src/oql/oql.c:1.60
--- gnue/geas/src/oql/oql.c:1.59        Fri Jun  8 14:46:13 2001
+++ gnue/geas/src/oql/oql.c     Fri Jun  8 15:42:43 2001
@@ -19,13 +19,15 @@
   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.59 2001/06/08 21:46:13 reinhard Exp $
+  $Id: oql.c,v 1.60 2001/06/08 22:42:43 reinhard Exp $
 */
 
 #include "config.h"
 #include "oql.h"
 #include <string.h>
 #include <ctype.h>
+#include <glib.h>
+#include <uuid/uuid.h>
 #include "geas-server.h"
 
 static _QueryData *create_query_data (const char *orderby);
@@ -1058,8 +1060,7 @@
  * Create OQL query for loading a single object with objectid equal to 'key'.
 \* ------------------------------------------------------------------------- */
 _QueryData *
-oql_load_object_by_key (configuration config, const char *classname,
-                        const char *key)
+oql_load_object_by_key (const char *classname, const char *key)
 {
   GList *l;
   GList *parents;
@@ -1122,7 +1123,7 @@
  * Create OQL query for loading all instances of a given class.
 \* ------------------------------------------------------------------------- */
 _QueryData *
-oql_find_all_objects (configuration config, const char *classname)
+oql_find_all_objects (const char *classname)
 {
   _QueryData *q = NULL;
   odl_class *c;
@@ -1178,8 +1179,8 @@
  * Create OQL query to get a single field from an object.
 \* ------------------------------------------------------------------------- */
 _QueryData *
-oql_load_object_field_by_key (configuration config, const char *classname,
-                              const char *field, const char *key)
+oql_load_object_field_by_key (const char *classname, const char *field,
+                              const char *key)
 {
   GList *l;
   GList *parents;
@@ -1230,7 +1231,7 @@
  * Create OQL query that loads all instances of a class.
 \* ------------------------------------------------------------------------- */
 _QueryData *
-oql_load_object (configuration config, const char *classname)
+oql_load_object (const char *classname)
 {
   GList *l, *tmp, *parents;
   _QueryData *q = NULL;
@@ -1312,7 +1313,7 @@
  * Parse OQL query and create.
 \* ------------------------------------------------------------------------- */
 _QueryData *
-oql_load (configuration config, const char *classname, const char *OQL_query)
+oql_load (const char *classname, const char *OQL_query)
 {
   fatal_error ("OQL text queries not yet supported.");
   return NULL;
@@ -1324,10 +1325,10 @@
  * in a particular field.
 \* ------------------------------------------------------------------------- */
 _QueryData *
-oql_objects_field_search (configuration config, const char *classname,
-                          const char *field, const char *value)
+oql_objects_field_search (const char *classname, const char *field,
+                          const char *value)
 {
-  _QueryData *q = oql_load_object (config, classname);
+  _QueryData *q = oql_load_object (classname);
 
   if (q)
     {
Index: gnue/geas/src/oql/oql.h
diff -u gnue/geas/src/oql/oql.h:1.29 gnue/geas/src/oql/oql.h:1.30
--- gnue/geas/src/oql/oql.h:1.29        Fri Jun  8 14:46:13 2001
+++ gnue/geas/src/oql/oql.h     Fri Jun  8 15:42:43 2001
@@ -19,7 +19,7 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: oql.h,v 1.29 2001/06/08 21:46:13 reinhard Exp $
+   $Id: oql.h,v 1.30 2001/06/08 22:42:43 reinhard Exp $
 */
 
 #ifndef _OQL_H
@@ -27,10 +27,11 @@
 
 #include <glib.h>
 #include "classdata.h"
-#include "config/configuration.h"
 
 /* handle to a query structure */
+/* FIXME: This is really a mess */
 typedef void    QueryData;
+typedef struct __QueryData _QueryData;
 
 typedef enum
 {
@@ -38,11 +39,56 @@
 }
 QueryType;
 
+/* handle to a query structure */
+/* this is needed by objectcache.c (sigh) */
+struct __QueryData
+{
+  /* All types */
+  QueryType type;
+  char *sql;
+  gboolean indatabase; /* used by WRITE */
+
+  char *orderby;
+  gboolean reversesearch;
+
+  GList *conditions;
+  GList *classes;
+  GList *fields;
+  GList *complex;
+
+  GList *values;
+
+  gboolean uselimit;
+  unsigned int maxresults;
+};
+
+enum querytest {
+     q_equals      , q_notequals ,
+     q_lessthan    , q_notlessthan ,
+     q_greaterthan , q_notgreaterthan ,
+     q_contains    , q_notcontains ,
+     q_startswith  , q_notstartswith ,
+     q_endswith    , q_notendswith ,
+     q_hackish /* a hack-ish flag */
+};
+
+/* fields for adding query coditions */
+/* this is needed by objectcache.c (sigh) */
+struct __QueryCondition
+{
+  char *targetclass;                 /* targetclass adding the condition to */
+  char *field;                       /* condition field */
+  char *relation;                    /* relation in query condition */
+  char *value;                       /* condition value */
+  enum querytest test;
+  gboolean casesensitive;
+};
+
+typedef struct __QueryCondition _QueryCondition;
+
 /* Database type */
 typedef int     DBType;
 
-#include "oql_internal.h"
-
 const char     *get_last_oql_error (void);
 
 /* get query as an ASCII text string. currently only supports GEAS
@@ -80,24 +126,21 @@
                                        const char *key);
 
 /* load a single object */
-_QueryData     *oql_load_object_by_key (configuration config,
-                                       const char *classname,
+_QueryData     *oql_load_object_by_key (const char *classname,
                                        const char *key);
 
 /* load all instances of a given class */
-_QueryData     *oql_find_all_objects (configuration config,
-                                     const char *classname);
+_QueryData     *oql_find_all_objects (const char *classname);
 
 /* get a single field from an object */
-_QueryData     *oql_load_object_field_by_key (configuration config,
-                                             const char *classname,
+_QueryData     *oql_load_object_field_by_key (const char *classname,
                                              const char *field,
                                              const char *key);
 
-_QueryData     *oql_load_object (configuration config, const char *classname);
+_QueryData     *oql_load_object (const char *classname);
 
 /* make a query, then add restrictions */
-#define create_base_query(config,classname)  
oql_find_all_objects(config,classname)
+#define create_base_query(classname)  oql_find_all_objects(classname)
 
 /* WHERE (loadclass.fieldname relation value) */
 gboolean        do_oql_add_query_constraint (_QueryData * query,
@@ -145,12 +188,10 @@
                                    oql_constraint * addme);
 
 /* parse OQL query and create */
-_QueryData     *oql_load (configuration config, const char *classname,
-                         const char *OQL_query);
+_QueryData     *oql_load (const char *classname, const char *OQL_query);
 
 /* search for objects that have a particular value in a particular field */
-_QueryData     *oql_objects_field_search (configuration config,
-                                         const char *classname,
+_QueryData     *oql_objects_field_search (const char *classname,
                                          const char *field,
                                          const char *value);