gnue/geas/src/oql oql.c oql.h

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/06/08 14:46:13

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

Log message:
        reformatted to GNU style

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/oql/oql.c.diff?cvsroot=OldCVS&tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/oql/oql.h.diff?cvsroot=OldCVS&tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: gnue/geas/src/oql/oql.c
diff -u gnue/geas/src/oql/oql.c:1.58 gnue/geas/src/oql/oql.c:1.59
--- gnue/geas/src/oql/oql.c:1.58        Thu Jun  7 13:00:22 2001
+++ gnue/geas/src/oql/oql.c     Fri Jun  8 14:46:13 2001
@@ -19,15 +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: oql.c,v 1.58 2001/06/07 20:00:22 baumannd Exp $
+  $Id: oql.c,v 1.59 2001/06/08 21:46:13 reinhard Exp $
 */
 
-
-#include <string.h>
-#include <ctype.h>
-
 #include "config.h"
 #include "oql.h"
+#include <string.h>
+#include <ctype.h>
 #include "geas-server.h"
 
 static _QueryData *create_query_data (const char *orderby);
Index: gnue/geas/src/oql/oql.h
diff -u gnue/geas/src/oql/oql.h:1.28 gnue/geas/src/oql/oql.h:1.29
--- gnue/geas/src/oql/oql.h:1.28        Thu Jun  7 08:29:52 2001
+++ gnue/geas/src/oql/oql.h     Fri Jun  8 14:46:13 2001
@@ -1,176 +1,198 @@
-
 /*
-   geas - GNU Enterprise Application Server
- 
+   SQL generation
+
    Copyright (C) 2001 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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
+
+   This file is part of the GNU Enterprise Application Server (GEAS)
+
+   GEAS is free software; you can redistribute it and/or modify it under
+   the terms of the GNU General Public License as published by the Free
+   Software Foundation; either version 2, or (at your option) any later
+   version.
+
+   GEAS is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
- 
+   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 $
 */
 
-#ifndef LIBOQL_H
-#define LIBOQL_H
+#ifndef _OQL_H
+#define _OQL_H
 
 #include <glib.h>
 #include "classdata.h"
 #include "config/configuration.h"
 
 /* handle to a query structure */
-typedef void QueryData;
+typedef void    QueryData;
 
 typedef enum
 {
-   OQL_SELECT, OQL_DELETE, OQL_WRITE
+  OQL_SELECT, OQL_DELETE, OQL_WRITE
 }
 QueryType;
 
 /* Database type */
-typedef int DBType;
+typedef int     DBType;
 
 #include "oql_internal.h"
 
-const char *get_last_oql_error(void);
+const char     *get_last_oql_error (void);
 
 /* get query as an ASCII text string. currently only supports GEAS
  * (objectstore) ready SQL (do not modify/free resulting string) */
-const char *oql_query_as_sql(_QueryData * query, DBType database);
+const char     *oql_query_as_sql (_QueryData * query, DBType database);
 
 /* let any part of GEAS create SQL statements. is this really a
  * good idea? somehow I really don't think so..... */
-_QueryData * oql_make_sql_query( const char *query );
+_QueryData     *oql_make_sql_query (const char *query);
 
 /* find the classname being loaded */
-const char *oql_query_get_classname(_QueryData * query);
+const char     *oql_query_get_classname (_QueryData * query);
 
 /* free memory associated with query (incl. ASCII strings, as above */
-void oql_free_query(_QueryData * query);
+void            oql_free_query (_QueryData * query);
 
 /* get field names in the order requested */
-const char *oql_query_get_field_name(_QueryData * query, int field);
+const char     *oql_query_get_field_name (_QueryData * query, int field);
 
 /* find a field name's index by position (ie, field 'NAME' was the
    Nth selected) */
-int oql_query_get_field_position(_QueryData * query, const char *fieldname);
+int             oql_query_get_field_position (_QueryData * query,
+                                             const char *fieldname);
 
 /* create queries */
 
 /* write data */
-_QueryData *oql_write_object (const gchar *classname, const gchar *key,
-                              GHashTable *values, gboolean update);
+_QueryData     *oql_write_object (const gchar * classname, const gchar * key,
+                                 GHashTable * values, gboolean update);
 
 /* delete entries */
-_QueryData *oql_delete_object(const char *classname, const char *key);
-_QueryData *oql_delete_all_objects(const char *classname, const char 
*fieldname,
-                                   const char *key);
+_QueryData     *oql_delete_object (const char *classname, const char *key);
+_QueryData     *oql_delete_all_objects (const char *classname,
+                                       const char *fieldname,
+                                       const char *key);
 
 /* load a single object */
-_QueryData *oql_load_object_by_key(configuration config, const char *classname,
-                                   const char *key);
+_QueryData     *oql_load_object_by_key (configuration config,
+                                       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 (configuration config,
+                                     const char *classname);
 
 /* 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);
+_QueryData     *oql_load_object_field_by_key (configuration config,
+                                             const char *classname,
+                                             const char *field,
+                                             const char *key);
 
-_QueryData *oql_load_object(configuration config, const char *classname);
+_QueryData     *oql_load_object (configuration config, const char *classname);
 
 /* make a query, then add restrictions */
 #define create_base_query(config,classname)  
oql_find_all_objects(config,classname)
 
 /* WHERE (loadclass.fieldname relation value) */
-gboolean do_oql_add_query_constraint(
-          _QueryData * query, const char *loadclass, const char *fieldname,
-          const char *relation, const char *value , enum querytest test ,
-         gboolean casesensitive);
+gboolean        do_oql_add_query_constraint (_QueryData * query,
+                                            const char *loadclass,
+                                            const char *fieldname,
+                                            const char *relation,
+                                            const char *value,
+                                            enum querytest test,
+                                            gboolean casesensitive);
 
-enum oql_logic {
-   oql_and , oql_or
+enum oql_logic
+{
+  oql_and, oql_or
 };
 
 typedef struct oql_field
 {
-   char *field;
-   enum querytest test;
-   gboolean invert;
-   char *value;
-   gboolean casesensitive;
-} oql_field;
+  char           *field;
+  enum querytest  test;
+  gboolean        invert;
+  char           *value;
+  gboolean        casesensitive;
+}
+oql_field;
 
 typedef struct oql_constraint
 {
-   char *classname;
-
-   enum oql_logic logic;
-   GList *fields;
-   GList *constraints;
-} oql_constraint;
+  char           *classname;
+  enum oql_logic  logic;
+  GList          *fields;
+  GList          *constraints;
+}
+oql_constraint;
 
-void oql_limit_results( _QueryData *q , unsigned long int limit );
+void            oql_limit_results (_QueryData * q, unsigned long int limit);
 
-gboolean oql_add_complex_constraint( _QueryData *q , oql_constraint *c );
+gboolean        oql_add_complex_constraint (_QueryData * q,
+                                           oql_constraint * c);
 
-oql_field *oql_make_field( char *field , enum querytest test , char *value , 
gboolean casesensitive , gboolean invert );
-oql_constraint *oql_make_constraint( enum oql_logic logic );
-void oql_add_field( oql_constraint *c , oql_field *f );
-void oql_add_constraint( oql_constraint *c , oql_constraint *addme );
+oql_field      *oql_make_field (char *field, enum querytest test, char *value,
+                               gboolean casesensitive, gboolean invert);
+oql_constraint *oql_make_constraint (enum oql_logic logic);
+void            oql_add_field (oql_constraint * c, oql_field * f);
+void            oql_add_constraint (oql_constraint * c,
+                                   oql_constraint * addme);
 
 /* parse OQL query and create */
-_QueryData *oql_load(configuration config, const char *classname,
-                     const char *OQL_query);
+_QueryData     *oql_load (configuration config, 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, const char *field,
-                                     const char *value);
+_QueryData     *oql_objects_field_search (configuration config,
+                                         const char *classname,
+                                         const char *field,
+                                         const char *value);
 
-void add_order_by(_QueryData * query, const char *orderby , gboolean reverse);
+void            add_order_by (_QueryData * query, const char *orderby,
+                             gboolean reverse);
 
 #define OQL_DBTYPE_CACHEONLY 0
 #define OQL_DBTYPE_UNKNOWN   (-1)
 
-#define OQL_DBTYPE_MYSQL                 1 /* MySQL format quoting */
-#define OQL_DBTYPE_POSTGRESQL           2               /* PostgreSQL format 
quoting */
+#define OQL_DBTYPE_MYSQL                 1     /* MySQL format quoting */
+#define OQL_DBTYPE_POSTGRESQL           2      /* PostgreSQL format quoting */
 //#define OQL_DBTYPE_POSTGRESQL_INSERT     3 /* PostgreSQL format quoting */
 //#define OQL_DBTYPE_POSTGRESQL_UPDATE     4 /* PostgreSQL format quoting */
 
 /* convert from old API to new */
 #define oql_add_query_constraint(q,x,v,r,c,f) 
do_oql_add_query_constraint(q,c,f,r,v,q_hackish,TRUE)
 
-char *
-oql_quote_column(const char *table, const char *column, DBType db);
+char           *oql_quote_column (const char *table, const char *column,
+                                 DBType db);
 
 typedef struct sql_reserved_word
 {
-   /* what's the word? */
-   char *word;
+  /* what's the word? */
+  char           *word;
+
+  /* true if reserved in a particular database */
+  gboolean        mysql, postgresql;
+}
+_sql_reserved_word;
 
-   /* true if reserved in a particular database */
-   gboolean mysql,postgresql;
-} _sql_reserved_word;
-
-void quick_reserved_word( const char *word , gboolean mysql , gboolean 
postgresql );
-void add_reserved_word( const char *word , int dbtype , gboolean reserved );
-gboolean is_word_reserved( const char *word , int dbtype );
+void            quick_reserved_word (const char *word, gboolean mysql,
+                                    gboolean postgresql);
+void            add_reserved_word (const char *word, int dbtype,
+                                  gboolean reserved);
+gboolean        is_word_reserved (const char *word, int dbtype);
 
 #define SQL_RESERVED     TRUE
 #define SQL_NOTRESERVED  FALSE
 
-char *oql_translate_for_write( char *value , odl_class *c , const char 
*fieldname , int database );
-char *oql_translate_from_read( char *value , odl_class *c , const char 
*fieldname , int database );
+char           *oql_translate_for_write (char *value, odl_class *c,
+                                        const char *fieldname, int database);
+char           *oql_translate_from_read (char *value, odl_class *c,
+                                        const char *fieldname, int database);
 
-#endif /* LIBOQL_H */
+#endif /* oql.h */