gnomemm r1553 - in libgdamm/branches/libgdamm-4-0: libgda/src tools/m4

[jhs svn gnome org]

Author: jhs
Date: Sat Jun  7 13:20:00 2008
New Revision: 1553
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1553&view=rev

Log:
2008-06-07  Johannes Schmid  <johannes schmid openismus com>

	* libgda/src/dataproxy.hg:
	Wrapped signal (needs patch to libgda #537105)
	
	* libgda/src/serveroperation.hg:
	* libgda/src/serverprovider.ccg:
	* libgda/src/serverprovider.hg:
	* tools/m4/convert_libgdamm.m4:
	Wrapped missing methods

Modified:
   libgdamm/branches/libgdamm-4-0/libgda/src/dataproxy.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/serveroperation.hg
   libgdamm/branches/libgdamm-4-0/libgda/src/serverprovider.ccg
   libgdamm/branches/libgdamm-4-0/libgda/src/serverprovider.hg
   libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/dataproxy.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/dataproxy.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/dataproxy.hg	Sat Jun  7 13:20:00 2008
@@ -112,7 +112,7 @@
   _WRAP_SIGNAL(void sample_size_changed(int sample_size), "sample-size-changed")
   _WRAP_SIGNAL(bool pre_changes_applied(int row, int proxied_row), "pre-changes-applied")
   _WRAP_SIGNAL(void post_changes_applied(int row, int proxied_row), "post-changes-applied")
-  //TODO: _WRAP_SIGNAL(void filter_changed(), "filter-changed")
+  _WRAP_SIGNAL(void filter_changed(), "filter-changed")
 };
 
 } // namespace Gda

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/serveroperation.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/serveroperation.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/serveroperation.hg	Sat Jun  7 13:20:00 2008
@@ -38,6 +38,7 @@
 _WRAP_ENUM(ServerOperationNodeType, GdaServerOperationNodeType)
 _WRAP_ENUM(ServerOperationNodeStatus, GdaServerOperationNodeStatus)
 _WRAP_ENUM(ServerOperationType, GdaServerOperationType)
+typedef GdaServerOperationNode ServerOperationNode;
 
 /** @defgroup DDL Data definition (DDL) queries
  */
@@ -63,19 +64,26 @@
 #endif // GLIBMM_EXCEPTIONS_ENABLED
 
   _WRAP_METHOD(ServerOperationNodeType get_node_type(const Glib::ustring& path, ServerOperationNodeStatus& status) const, gda_server_operation_get_node_type)
- //_WRAP_METHOD(ServerOperationNodeType get_node_type_v(const Glib::ustring& *path_array),  gda_server_operation_get_node_type_v)
-
-  //_WRAP_METHOD(GdaSet* get_node_parameter_list(const Glib::ustring& path) const, gda_server_operation_get_node_plist)
-  //_WRAP_METHOD(GdaSet *gda_server_operation_get_node_plist_v(const Glib::ustring& *path_array)
-
-  //_WRAP_METHOD(GdaParameter* get_node_param(const Glib::ustring& path) const, gda_server_operation_get_node_param)
-  //_WRAP_METHOD(GdaParameter* gda_server_operation_get_node_param_v(const Glib::ustring& *path_array), gda_server_operation_get_node_param_v)
-
-  //_WRAP_METHOD(GdaDataModel* get_node_datamodel(const Glib::ustring& path) const, gda_server_operation_get_node_datamodel, refreturn)
-  //_WRAP_METHOD(GdaDataModel* get_node_datamodel_v(const Glib::ustring& *path_array), gda_server_operation_get_node_datamodel_v, refreturn)
-
-  //_WRAP_METHOD(int get_node_seq_size(const Glib::ustring& path) const, gda_server_operation_get_node_seq_size)
-  //_WRAP_METHOD(int get_node_seq_size_v(const Glib::ustring& path_array) const, gda_server_operation_get_node_seq_size_v)
+  _WRAP_METHOD(guint get_sequence_size(const Glib::ustring& path), gda_server_operation_get_sequence_size);
+  _WRAP_METHOD(guint get_sequence_max_size(const Glib::ustring& path), gda_server_operation_get_sequence_max_size);
+  _WRAP_METHOD(guint get_sequence_min_size(const Glib::ustring& path), gda_server_operation_get_sequence_min_size);
+  _WRAP_METHOD(Glib::StringArrayHandle get_sequence_item_names(const Glib::ustring& path), gda_server_operation_get_sequence_item_names);
+  _WRAP_METHOD(Glib::ustring get_sequence_name(const std::string& path), gda_server_operation_get_sequence_name);
+
+  //TODO: get_node_info => varargs
+  _WRAP_METHOD(bool is_valid(const std::string& xml_file), gda_server_operation_is_valid, errthrow)
+  _WRAP_METHOD(bool load_data_from_xml (xmlNodePtr node), gda_server_operation_load_data_from_xml, errthrow)
+  _WRAP_METHOD(xmlNodePtr save_data_to_xml(), gda_server_operation_save_data_to_xml, errthrow)  
+  _WRAP_METHOD(Glib::ustring get_node_path_portion(const Glib::ustring& path), gda_server_operation_get_node_path_portion)
+  _WRAP_METHOD(Glib::ustring get_node_parent(const Glib::ustring& path), gda_server_operation_get_node_parent)
+  _WRAP_METHOD(ServerOperationType get_op_type(), gda_server_operation_get_op_type)
+  
+  _WRAP_METHOD(bool del_item_from_sequence(const std::string& item_path), gda_server_operation_del_item_from_sequence)
+  _WRAP_METHOD(guint add_item_to_sequence(const std::string& item_path), gda_server_operation_add_item_to_sequence)
+  _WRAP_METHOD(Glib::StringArrayHandle get_root_nodes(), gda_server_operation_get_root_nodes);
+  
+  //_WRAP_SIGNAL(void signal_sequence_item_added(const Glib::ustring& arg1, int arg2), "sequence-item-added")
+  //_WRAP_SIGNAL(void signal_sequence_item_remove(const Glib::ustring& arg1, int arg2), "sequence-item-remove")
 
 
  //TODO: vfuncs.

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/serverprovider.ccg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/serverprovider.ccg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/serverprovider.ccg	Sat Jun  7 13:20:00 2008
@@ -22,6 +22,8 @@
 
 #include <libgdamm/connection.h>
 #include <libgda/gda-enum-types.h>
+#include <libgda/gda-server-provider.h>
+#include <libgda/gda-server-provider-extra.h>
 
 namespace Gnome
 {

Modified: libgdamm/branches/libgdamm-4-0/libgda/src/serverprovider.hg
==============================================================================
--- libgdamm/branches/libgdamm-4-0/libgda/src/serverprovider.hg	(original)
+++ libgdamm/branches/libgdamm-4-0/libgda/src/serverprovider.hg	Sat Jun  7 13:20:00 2008
@@ -78,9 +78,13 @@
   _WRAP_METHOD_DOCS_ONLY(gda_server_provider_string_to_value)
   Glib::ValueBase string_to_value(const Glib::RefPtr<Connection>& cnc, const Glib::ustring& string, GType prefered_type, Glib::ustring& dbms_type);
 
+  _WRAP_METHOD(Glib::RefPtr<DataHandler> get_data_handler_default(const Glib::RefPtr<Connection>& cnc, GType type, const Glib::ustring& dbms_type), gda_server_provider_get_data_handler_default)
+  _WRAP_METHOD(std::string find_file (const std::string& inst_dir, const std::string& filename), gda_server_provider_find_file)
+  _WRAP_METHOD(bool provide_operation_default (const Glib::RefPtr<Connection>& cnc, const Glib::RefPtr<ServerOperation>& op), gda_server_provider_perform_operation_default, errthrow)
+    
   // These are in a private header, so ignore them
   _IGNORE(gda_server_provider_handler_declare, gda_server_provider_handler_find, 
-          gda_server_provider_interal_get_parser)
+          gda_server_provider_internal_get_parser)
 
  //TODO: vfuncs.
 };

Modified: libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4
==============================================================================
--- libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4	(original)
+++ libgdamm/branches/libgdamm-4-0/tools/m4/convert_libgdamm.m4	Sat Jun  7 13:20:00 2008
@@ -1,5 +1,6 @@
 _EQUAL(glong,long)
 _EQUAL(GdaMetaContext*, MetaContext*)
+_EQUAL(GdaServerOperationNode*, ServerOperationNode*)
 
 _CONVERSION(`GdaConnectionEvent*',`Glib::RefPtr<ConnectionEvent>',`Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<ConnectionEvent>&', `GdaConnectionEvent*', __CONVERT_REFPTR_TO_P)
@@ -108,7 +109,8 @@
 _CONVERSION(`const GSList*',`Glib::SListHandle<const DictType>',__FL2H_SHALLOW)
 _CONVERSION(`const Glib::SListHandle<DictType>&',`const GSList*',`$3.data()')
 
-
+# Arrays
+_CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
 
 # For signals:
 _CONVERSION(`GdaConnection*',`const Glib::RefPtr<Connection>&',`Glib::wrap($3)')