GNOME.org
 

libgda r3238 - in trunk: . doc/C doc/C/tmpl libgda libgda/handlers providers/postgres

Author: vivien
Date: Fri Oct 10 16:41:17 2008
New Revision: 3238
URL: http://svn.gnome.org/viewvc/libgda?rev=3238&view=rev

Log:
2008-10-10  Vivien Malerba <malerba gnome-db org>

        * libgda/handlers/gda-handler-type.c: use g_value_[sg]et_gtype() instead of
        g_value_[sg]et_ulong()
        * providers/postgres/gda-postgres-recordset.c: correclty handle the G_TYPE_GTYPE
        values as the string representation must be converted to a GType (the type
        is not stored as a string representation of its numerical value)
        * libgda/gda-statement.[ch]: removed gda_statement_deserialize() as it's not
        implemented
        * libgda/gda-value.h: added a reserved pointer to GdaNumeric be able to maniuplate
        GdaNumeric structures using the GMP library
        * libgda/gda-data-model.c:
        * libgda/gda-data-model-extra.h: made gda_data_model_signal_emit_changed()
        static as it's not used outside
        * configure.in:
          - really only export the needed symbols,
          - proposed fixed for MinGW building on Windows


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/doc/C/libgda-4.0-sections.txt
   trunk/doc/C/tmpl/gda-data-proxy.sgml
   trunk/doc/C/tmpl/gda-handler-type.sgml
   trunk/doc/C/tmpl/gda-statement.sgml
   trunk/doc/C/tmpl/gda-value.sgml
   trunk/libgda/gda-data-model-extra.h
   trunk/libgda/gda-data-model.c
   trunk/libgda/gda-statement.c
   trunk/libgda/gda-statement.h
   trunk/libgda/gda-value.h
   trunk/libgda/handlers/gda-handler-type.c
   trunk/providers/postgres/gda-postgres-recordset.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Oct 10 16:41:17 2008
@@ -136,7 +136,7 @@
 dnl ******************************
 dnl linklibext is the shared link library extension, which varies by platform
 
-EXPORT_SYM_REGEX='-export-symbols-regex "^[[^(_|sqlite3|pcache|csv|MD5)]].*"'
+EXPORT_SYM_REGEX='-export-symbols-regex "^(gda_|fnYM49765777344607__gda).*"'
 AC_MSG_CHECKING([for platform])
 platform_win32=no
 platform_carbon=no
@@ -158,6 +158,7 @@
     SOPREFIX='lib'
     LIBTOOL_EXPORT_OPTIONS=
     linklibext=".dll.a"
+    AC_CHECK_TOOL(WINDRES, windres, windres)
     AC_SUBST(WINDRES)
     ;;
 *-*-darwin*)
@@ -1119,7 +1120,11 @@
 dnl Check for readline/history
 dnl **************************
 if test x"$platform_win32" = "xyes"; then
-	AC_CHECK_LIB(readline, readline, READLINE_LIB='-lreadline', [])
+	if test $cross_compiling = yes; then
+  		AC_CHECK_LIB(readline, readline, READLINE_LIB='-lreadline', [])
+	else
+  		AC_CHECK_LIB(readline, readline, READLINE_LIB='-lreadline -lcurses', [], -lcurses)
+	fi
 else
 	AC_CHECK_LIB(readline, readline, READLINE_LIB='-lreadline -lcurses', [], -lcurses)
 fi

Modified: trunk/doc/C/libgda-4.0-sections.txt
==============================================================================
--- trunk/doc/C/libgda-4.0-sections.txt	(original)
+++ trunk/doc/C/libgda-4.0-sections.txt	Fri Oct 10 16:41:17 2008
@@ -900,7 +900,6 @@
 <FILE>gda-handler-type</FILE>
 <TITLE>GdaHandlerType</TITLE>
 GdaHandlerType
-GdaHandlerType
 GdaHandlerTypeClass
 GdaHandlerTypePriv
 gda_handler_type_new
@@ -1085,7 +1084,6 @@
 gda_statement_new
 gda_statement_copy
 gda_statement_serialize
-gda_statement_deserialize
 gda_statement_get_parameters
 gda_statement_to_sql
 gda_statement_to_sql_extended

Modified: trunk/doc/C/tmpl/gda-data-proxy.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-data-proxy.sgml	(original)
+++ trunk/doc/C/tmpl/gda-data-proxy.sgml	Fri Oct 10 16:41:17 2008
@@ -200,6 +200,7 @@
 @sample_changed: 
 @validate_row_changes: 
 @row_changes_applied: 
+ filter_changed: 
 
 <!-- ##### STRUCT GdaDataProxyPrivate ##### -->
 <para>

Modified: trunk/doc/C/tmpl/gda-handler-type.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-handler-type.sgml	(original)
+++ trunk/doc/C/tmpl/gda-handler-type.sgml	Fri Oct 10 16:41:17 2008
@@ -6,7 +6,9 @@
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+  This data handler converts GValue of type G_TYPE_GTYPE to SQL and string where
+  the GType is stored as its type name. For example a G_TYPE_GTYPE GValue containing
+  G_TYPE_INT will be converted to SQL as 'gint'.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -23,12 +25,6 @@
 </para>
 
 
-<!-- ##### STRUCT GdaHandlerType ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT GdaHandlerTypeClass ##### -->
 <para>
 

Modified: trunk/doc/C/tmpl/gda-statement.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-statement.sgml	(original)
+++ trunk/doc/C/tmpl/gda-statement.sgml	Fri Oct 10 16:41:17 2008
@@ -124,16 +124,6 @@
 @Returns: 
 
 
-<!-- ##### FUNCTION gda_statement_deserialize ##### -->
-<para>
-
-</para>
-
- str: 
- error: 
- Returns: 
-
-
 <!-- ##### FUNCTION gda_statement_get_parameters ##### -->
 <para>
 

Modified: trunk/doc/C/tmpl/gda-value.sgml
==============================================================================
--- trunk/doc/C/tmpl/gda-value.sgml	(original)
+++ trunk/doc/C/tmpl/gda-value.sgml	Fri Oct 10 16:41:17 2008
@@ -419,6 +419,7 @@
 @number: 
 @precision: 
 @width: 
+ reserved: 
 
 <!-- ##### FUNCTION gda_numeric_copy ##### -->
 <para>

Modified: trunk/libgda/gda-data-model-extra.h
==============================================================================
--- trunk/libgda/gda-data-model-extra.h	(original)
+++ trunk/libgda/gda-data-model-extra.h	Fri Oct 10 16:41:17 2008
@@ -28,8 +28,6 @@
 
 G_BEGIN_DECLS
 
-void     gda_data_model_signal_emit_changed             (GdaDataModel *model);
-
 void     gda_data_model_row_inserted        (GdaDataModel *model, gint row);
 void     gda_data_model_row_updated         (GdaDataModel *model, gint row);
 void     gda_data_model_row_removed         (GdaDataModel *model, gint row);

Modified: trunk/libgda/gda-data-model.c
==============================================================================
--- trunk/libgda/gda-data-model.c	(original)
+++ trunk/libgda/gda-data-model.c	Fri Oct 10 16:41:17 2008
@@ -157,8 +157,8 @@
 	return notify_changes;
 }
 
-/**
- * gda_data_model_signal_emit_changed
+/*
+ * _gda_data_model_signal_emit_changed
  * @model: a #GdaDataModel object.
  *
  * Notifies listeners of the given data model object of changes
@@ -167,8 +167,8 @@
  * class, thus being notified of any new data being appended
  * or removed from the data model.
  */
-void
-gda_data_model_signal_emit_changed (GdaDataModel *model)
+static void
+_gda_data_model_signal_emit_changed (GdaDataModel *model)
 {
 	g_return_if_fail (GDA_IS_DATA_MODEL (model));
 	
@@ -212,7 +212,7 @@
 			       gda_data_model_signals[ROW_INSERTED],
 			       0, row);
 
-		gda_data_model_signal_emit_changed (model);
+		_gda_data_model_signal_emit_changed (model);
 	}
 }
 
@@ -236,7 +236,7 @@
 			       gda_data_model_signals[ROW_UPDATED],
 			       0, row);
 
-		gda_data_model_signal_emit_changed (model);
+		_gda_data_model_signal_emit_changed (model);
 	}
 }
 
@@ -260,7 +260,7 @@
 			       gda_data_model_signals[ROW_REMOVED],
 			       0, row);
 
-		gda_data_model_signal_emit_changed (model);
+		_gda_data_model_signal_emit_changed (model);
 	}
 }
 
@@ -278,7 +278,7 @@
 	g_signal_emit (G_OBJECT (model),
 		       gda_data_model_signals[RESET], 0);
 
-	gda_data_model_signal_emit_changed (model);
+	_gda_data_model_signal_emit_changed (model);
 }
 
 /**

Modified: trunk/libgda/gda-statement.c
==============================================================================
--- trunk/libgda/gda-statement.c	(original)
+++ trunk/libgda/gda-statement.c	Fri Oct 10 16:41:17 2008
@@ -449,24 +449,6 @@
 	return str;
 }
 
-/**
- * gda_statement_deserialize
- * @str: a string containing a serialized version of a #GdaStatement
- * @error: a place to store errors, or %NULL
- *
- * Creates a new #GdaStatement from a string
- *
- * Returns: a new #GdaStatement object, or %NULL if an error occurred
- */
-GdaStatement *
-gda_statement_deserialize (const gchar *str, GError **error)
-{
-	g_return_val_if_fail (str || *str, NULL);
-	TO_IMPLEMENT;
-
-	return NULL;
-}
-
 static gboolean
 get_params_foreach_func (GdaSqlAnyPart *node, GdaSet **params, GError **error)
 {

Modified: trunk/libgda/gda-statement.h
==============================================================================
--- trunk/libgda/gda-statement.h	(original)
+++ trunk/libgda/gda-statement.h	Fri Oct 10 16:41:17 2008
@@ -87,7 +87,6 @@
 GdaStatement       *gda_statement_copy                   (GdaStatement *orig);
 
 gchar              *gda_statement_serialize              (GdaStatement *stmt);
-GdaStatement       *gda_statement_deserialize            (const gchar *str, GError **error);
 
 gboolean            gda_statement_get_parameters         (GdaStatement *stmt, GdaSet **out_params, GError **error);
 #define             gda_statement_to_sql(stmt,params,error) gda_statement_to_sql_extended ((stmt), NULL, (params), GDA_STATEMENT_SQL_PARAMS_SHORT, NULL, (error))

Modified: trunk/libgda/gda-value.h
==============================================================================
--- trunk/libgda/gda-value.h	(original)
+++ trunk/libgda/gda-value.h	Fri Oct 10 16:41:17 2008
@@ -67,28 +67,29 @@
 } GdaGeometricPoint;
 
 typedef struct {
-	gchar *number;
-	glong precision;
-	glong width;
+	gchar   *number;
+	glong    precision;
+	glong    width;
+	gpointer reserved; /* reserved for future usage with GMP (http://gmplib.org/) */
 } GdaNumeric;
 
 typedef struct {
 	gushort hour;
 	gushort minute;
 	gushort second;
-	gulong fraction;
-	glong timezone;	/* # of seconds to the east UTC */
+	gulong  fraction;
+	glong   timezone;	/* # of seconds to the east UTC */
 } GdaTime;
 
 typedef struct {
-	gshort year;
+	gshort  year;
 	gushort month;
 	gushort day;
 	gushort hour;
 	gushort minute;
 	gushort second;
-	gulong fraction;
-	glong timezone;	/* # of seconds to the east UTC */
+	gulong  fraction;
+	glong   timezone;	/* # of seconds to the east UTC */
 } GdaTimestamp;
 
 typedef struct {

Modified: trunk/libgda/handlers/gda-handler-type.c
==============================================================================
--- trunk/libgda/handlers/gda-handler-type.c	(original)
+++ trunk/libgda/handlers/gda-handler-type.c	Fri Oct 10 16:41:17 2008
@@ -176,10 +176,10 @@
 
 	if (value) {
 		GTypeQuery tq;
-		g_type_query (g_value_get_ulong (value), &tq);
+		g_type_query (g_value_get_gtype (value), &tq);
 		if (tq.type != 0) {
 			const gchar *str;
-			str = gda_g_type_to_string (g_value_get_ulong (value));
+			str = gda_g_type_to_string (g_value_get_gtype (value));
 			retval = g_strdup_printf ("'%s'", str);
 		}
 		else
@@ -204,9 +204,9 @@
 	if (value) {
 		GTypeQuery tq;
        
-		g_type_query (g_value_get_ulong (value), &tq);
+		g_type_query (g_value_get_gtype (value), &tq);
 		if (tq.type != 0)
-			retval = g_strdup (gda_g_type_to_string (g_value_get_ulong (value)));
+			retval = g_strdup (gda_g_type_to_string (g_value_get_gtype (value)));
 		else
 			retval = g_strdup (NULL); /* FIXME: return NULL instead because of the error? */
 	}
@@ -235,7 +235,7 @@
 			type = gda_g_type_from_string (str+1);
 			g_free (str);
 			value = g_value_init (g_new0 (GValue, 1), G_TYPE_GTYPE);
-			g_value_set_ulong (value, type);
+			g_value_set_gtype (value, type);
 		}
 	}
 	else
@@ -256,7 +256,7 @@
 
 	vtype = gda_g_type_from_string (str);
 	value = g_value_init (g_new0 (GValue, 1), G_TYPE_GTYPE);
-	g_value_set_ulong (value, vtype);
+	g_value_set_gtype (value, vtype);
 
 	return value;
 }

Modified: trunk/providers/postgres/gda-postgres-recordset.c
==============================================================================
--- trunk/providers/postgres/gda-postgres-recordset.c	(original)
+++ trunk/providers/postgres/gda-postgres-recordset.c	Fri Oct 10 16:41:17 2008
@@ -690,7 +690,7 @@
 		gda_value_take_blob (value, blob);
 	}
 	else if (type == G_TYPE_GTYPE)
-		g_value_set_gtype (value, atoul (thevalue));
+		g_value_set_gtype (value, gda_g_type_from_string (thevalue));
 	else {
 		g_warning ("Type %s not translated for value '%s' => set as string", g_type_name (type), thevalue);
 		gda_value_reset_with_type (value, G_TYPE_STRING);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]