From 5b9b9e8309d15cb41d2d1140a999723d5012b9bb Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 20 Jan 2018 09:46:05 +0100 Subject: [PATCH] Changed name and namespace. --- configure.ac | 2 +- src/Makefile.am | 2 +- src/{dbtransformer.c => dbt.c} | 241 ++++++++++++++++----------------- src/libzakdbt.h | 44 +++--- tests/test.c | 12 +- 5 files changed, 150 insertions(+), 151 deletions(-) rename src/{dbtransformer.c => dbt.c} (83%) diff --git a/configure.ac b/configure.ac index 40980dc..105d35e 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.65) AC_INIT([libzakdbt], [0.0.1], [azagli@libero.it]) -AC_CONFIG_SRCDIR([src/dbtransformer.c]) +AC_CONFIG_SRCDIR([src/dbt.c]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE(-Wall) diff --git a/src/Makefile.am b/src/Makefile.am index a9d7518..b785dff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = $(DBT_CFLAGS) lib_LTLIBRARIES = libzakdbt.la -libzakdbt_la_SOURCES = dbtransformer.c +libzakdbt_la_SOURCES = dbt.c libzakdbt_la_LDFLAGS = -no-undefined diff --git a/src/dbtransformer.c b/src/dbt.c similarity index 83% rename from src/dbtransformer.c rename to src/dbt.c index 2315772..3a6bac2 100644 --- a/src/dbtransformer.c +++ b/src/dbt.c @@ -50,24 +50,24 @@ static gchar *str_xslt_doc = "\n" ""; -static void dbt_class_init (DbtClass *class); -static void dbt_init (Dbt *dbt); +static void zak_dbt_dbt_class_init (ZakDbtDbtClass *class); +static void zak_dbt_dbt_init (ZakDbtDbt *dbt); -static void dbt_set_property (GObject *object, +static void zak_dbt_dbt_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); -static void dbt_get_property (GObject *object, +static void zak_dbt_dbt_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); -static gboolean dbt_check_db (Dbt *dbt, gboolean create_tables); +static gboolean zak_dbt_dbt_check_db (ZakDbtDbt *dbt, gboolean create_tables); -#define DBT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_DBT, DbtPrivate)) +#define ZAK_DBT_DBT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_DBT_TYPE_DBT, ZakDbtDbtPrivate)) -typedef struct _DbtPrivate DbtPrivate; -struct _DbtPrivate +typedef struct _ZakDbtDbtPrivate ZakDbtDbtPrivate; +struct _ZakDbtDbtPrivate { GdaConnection *gda_conn; GdaSqlParser *gda_parser; @@ -77,23 +77,23 @@ struct _DbtPrivate xmlNodePtr xml_root; }; -G_DEFINE_TYPE (Dbt, dbt, G_TYPE_OBJECT) +G_DEFINE_TYPE (ZakDbtDbt, zak_dbt_dbt, G_TYPE_OBJECT) static void -dbt_class_init (DbtClass *class) +zak_dbt_dbt_class_init (ZakDbtDbtClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->set_property = dbt_set_property; - object_class->get_property = dbt_get_property; + object_class->set_property = zak_dbt_dbt_set_property; + object_class->get_property = zak_dbt_dbt_get_property; - g_type_class_add_private (object_class, sizeof (DbtPrivate)); + g_type_class_add_private (object_class, sizeof (ZakDbtDbtPrivate)); } static void -dbt_init (Dbt *dbt) +zak_dbt_dbt_init (ZakDbtDbt *dbt) { - DbtPrivate *priv = DBT_GET_PRIVATE (dbt); + ZakDbtDbtPrivate *priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); priv->gda_conn = NULL; priv->gda_parser = NULL; @@ -102,23 +102,22 @@ dbt_init (Dbt *dbt) } /** - * dbt_new: + * zak_dbt_dbt_new: * - * Returns: the newly created #Dbt object. + * Returns: the newly created #ZakDbtDbt object. */ -Dbt -*dbt_new () +ZakDbtDbt +*zak_dbt_dbt_new () { - return DBT (g_object_new (dbt_get_type (), NULL)); + return ZAK_DBT_DBT (g_object_new (zak_dbt_dbt_get_type (), NULL)); } static gboolean -dbt_get_connection_parser (Dbt *dbt) +zak_dbt_dbt_get_connection_parser (ZakDbtDbt *dbt) { - DbtPrivate *priv; - GdaSqlParser *parser; + ZakDbtDbtPrivate *priv; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); /* create an SQL parser */ priv->gda_parser = gda_connection_create_parser (priv->gda_conn); @@ -131,24 +130,24 @@ dbt_get_connection_parser (Dbt *dbt) } /** - * dbt_set_db_connection: + * zak_dbt_dbt_set_db_connection: * @dbt: * @gda_conn: * */ void -dbt_set_db_connection (Dbt *dbt, GdaConnection *gda_conn) +zak_dbt_dbt_set_db_connection (ZakDbtDbt *dbt, GdaConnection *gda_conn) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; - g_return_if_fail (IS_DBT (dbt)); + g_return_if_fail (ZAK_DBT_IS_DBT (dbt)); g_return_if_fail (GDA_IS_CONNECTION (gda_conn)); - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); priv->gda_conn = gda_conn; - if (!dbt_get_connection_parser (dbt)) + if (!zak_dbt_dbt_get_connection_parser (dbt)) { priv->gda_conn= NULL; @@ -159,28 +158,28 @@ dbt_set_db_connection (Dbt *dbt, GdaConnection *gda_conn) } /** - * dbt_set_db_connection_from_string: + * zak_dbt_dbt_set_db_connection_from_string: * @dbt: * @cnc_string: * */ void -dbt_set_db_connection_from_string (Dbt *dbt, const gchar *cnc_string) +zak_dbt_dbt_set_db_connection_from_string (ZakDbtDbt *dbt, const gchar *cnc_string) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gchar *cnc; GError *error; - g_return_if_fail (IS_DBT (dbt)); + g_return_if_fail (ZAK_DBT_IS_DBT (dbt)); g_return_if_fail (cnc_string != NULL); cnc = g_strstrip (g_strdup (cnc_string)); g_return_if_fail (g_strcmp0 (cnc, "") != 0); - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); error = NULL; priv->gda_conn = gda_connection_open_from_string (NULL, cnc, NULL, @@ -193,7 +192,7 @@ dbt_set_db_connection_from_string (Dbt *dbt, const gchar *cnc_string) return; } - if (!dbt_get_connection_parser (dbt)) + if (!zak_dbt_dbt_get_connection_parser (dbt)) { priv->gda_conn= NULL; return; @@ -203,7 +202,7 @@ dbt_set_db_connection_from_string (Dbt *dbt, const gchar *cnc_string) } static gboolean -dbt_check_xml_root (xmlNodePtr xml_root) +zak_dbt_dbt_check_xml_root (xmlNodePtr xml_root) { if (xmlStrcmp (xml_root->name, (const xmlChar *)"dbtransformer") != 0) { @@ -217,18 +216,18 @@ dbt_check_xml_root (xmlNodePtr xml_root) } static gboolean -dbt_sort_xml (Dbt *dbt) +zak_dbt_dbt_sort_xml (ZakDbtDbt *dbt) { gboolean ret; - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; xmlDocPtr xslt_xdoc; xsltStylesheetPtr xslt; ret = FALSE; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); xmlSubstituteEntitiesDefault (1); @@ -260,7 +259,7 @@ dbt_sort_xml (Dbt *dbt) return ret; } - if (!dbt_check_xml_root (priv->xml_root)) + if (!zak_dbt_dbt_check_xml_root (priv->xml_root)) { priv->xml_root = NULL; @@ -276,23 +275,23 @@ dbt_sort_xml (Dbt *dbt) } /** - * dbt_set_xml: + * zak_dbt_dbt_set_xml: * @dbt: * @xml_root: * */ void -dbt_set_xml (Dbt *dbt, xmlNodePtr xml_root) +zak_dbt_dbt_set_xml (ZakDbtDbt *dbt, xmlNodePtr xml_root) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; - g_return_if_fail (IS_DBT (dbt)); + g_return_if_fail (ZAK_DBT_IS_DBT (dbt)); g_return_if_fail (xml_root != NULL); - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); priv->xml_root = xml_root; - if (!dbt_check_xml_root (priv->xml_root)) + if (!zak_dbt_dbt_check_xml_root (priv->xml_root)) { priv->xml_root = NULL; return; @@ -310,24 +309,24 @@ dbt_set_xml (Dbt *dbt, xmlNodePtr xml_root) } } - dbt_sort_xml (dbt); + zak_dbt_dbt_sort_xml (dbt); } /** - * dbt_set_xml_from_filename: + * zak_dbt_dbt_set_xml_from_filename: * @dbt: * @filename: * */ void -dbt_set_xml_from_filename (Dbt *dbt, const gchar *filename) +zak_dbt_dbt_set_xml_from_filename (ZakDbtDbt *dbt, const gchar *filename) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gchar *filen; xmlDocPtr xdoc; - g_return_if_fail (IS_DBT (dbt)); + g_return_if_fail (ZAK_DBT_IS_DBT (dbt)); g_return_if_fail (filename != NULL); filen = g_strstrip (g_strdup (filename)); @@ -343,7 +342,7 @@ dbt_set_xml_from_filename (Dbt *dbt, const gchar *filename) return; } - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); priv->xml_doc = xdoc; @@ -360,26 +359,26 @@ dbt_set_xml_from_filename (Dbt *dbt, const gchar *filename) return; } - if (!dbt_check_xml_root (priv->xml_root)) + if (!zak_dbt_dbt_check_xml_root (priv->xml_root)) { priv->xml_root = NULL; return; } - dbt_sort_xml (dbt); + zak_dbt_dbt_sort_xml (dbt); } /** - * dbt_db_is_updated: + * zak_dbt_dbt_db_is_updated: * @dbt: * */ gboolean -dbt_db_is_updated (Dbt *dbt) +zak_dbt_dbt_db_is_updated (ZakDbtDbt *dbt) { gboolean ret; - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; xmlXPathContextPtr xpcontext; xmlXPathObjectPtr xpresult; @@ -393,13 +392,13 @@ dbt_db_is_updated (Dbt *dbt) GdaDataModel *dm; GError *error; - g_return_val_if_fail (IS_DBT (dbt), FALSE); + g_return_val_if_fail (ZAK_DBT_IS_DBT (dbt), FALSE); - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); ret = FALSE; - if (!dbt_check_db (dbt, FALSE)) + if (!zak_dbt_dbt_check_db (dbt, FALSE)) { return ret; } @@ -429,7 +428,7 @@ dbt_db_is_updated (Dbt *dbt) return ret; } - sql = g_strdup_printf ("SELECT id FROM dbt_transformations" + sql = g_strdup_printf ("SELECT id FROM zak_dbt_dbt_transformations" " WHERE id = %d", id); error = NULL; @@ -462,9 +461,9 @@ dbt_db_is_updated (Dbt *dbt) } static gboolean -dbt_check_db (Dbt *dbt, gboolean create_tables) +zak_dbt_dbt_check_db (ZakDbtDbt *dbt, gboolean create_tables) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; GdaStatement *stmt; GdaDataModel *dm; @@ -476,7 +475,7 @@ dbt_check_db (Dbt *dbt, gboolean create_tables) ret = FALSE; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); if (!GDA_IS_SQL_PARSER (priv->gda_parser)) { @@ -485,7 +484,7 @@ dbt_check_db (Dbt *dbt, gboolean create_tables) } /* dbtransformer tables check */ - sql = "SELECT id FROM dbt_transformations WHERE 0=1"; + sql = "SELECT id FROM zak_dbt_dbt_transformations WHERE 0=1"; error = NULL; stmt = gda_sql_parser_parse_string (priv->gda_parser, sql, NULL, &error); if (stmt == NULL) @@ -519,7 +518,7 @@ dbt_check_db (Dbt *dbt, gboolean create_tables) /* Set parameter's values */ /* table name */ - gda_server_operation_set_value_at (op, "dbt_transformations", &error, "/TABLE_DEF_P/TABLE_NAME"); + gda_server_operation_set_value_at (op, "zak_dbt_dbt_transformations", &error, "/TABLE_DEF_P/TABLE_NAME"); /* "id" field */ i = 0; @@ -556,9 +555,9 @@ dbt_check_db (Dbt *dbt, gboolean create_tables) } static gboolean -dbt_check_to_execute (Dbt *dbt, guint id) +zak_dbt_dbt_check_to_execute (ZakDbtDbt *dbt, guint id) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gboolean ret; @@ -568,7 +567,7 @@ dbt_check_to_execute (Dbt *dbt, guint id) g_return_val_if_fail (id > 0, FALSE); - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); ret = FALSE; @@ -578,7 +577,7 @@ dbt_check_to_execute (Dbt *dbt, guint id) return ret; } - sql = g_strdup_printf ("SELECT id FROM dbt_transformations" + sql = g_strdup_printf ("SELECT id FROM zak_dbt_dbt_transformations" " WHERE id = %d", id); stmt = gda_sql_parser_parse_string (priv->gda_parser, sql, NULL, &error); @@ -608,9 +607,9 @@ dbt_check_to_execute (Dbt *dbt, guint id) } static gboolean -dbt_save_transformation (Dbt *dbt, guint id, const gchar *operation) +zak_dbt_dbt_save_transformation (ZakDbtDbt *dbt, guint id, const gchar *operation) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gboolean ret; @@ -618,7 +617,7 @@ dbt_save_transformation (Dbt *dbt, guint id, const gchar *operation) GError *error; GdaStatement *stmt; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); ret = FALSE; @@ -628,7 +627,7 @@ dbt_save_transformation (Dbt *dbt, guint id, const gchar *operation) return ret; } - sql = g_strdup_printf ("INSERT INTO dbt_transformations" + sql = g_strdup_printf ("INSERT INTO zak_dbt_dbt_transformations" " (id, operation)" " VALUES (%d, '%s')", id, operation); @@ -658,9 +657,9 @@ dbt_save_transformation (Dbt *dbt, guint id, const gchar *operation) } static gboolean -dbt_parse_sql (Dbt *dbt, xmlNodePtr xnode) +zak_dbt_dbt_parse_sql (ZakDbtDbt *dbt, xmlNodePtr xnode) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gchar *sql; GError *error; @@ -670,7 +669,7 @@ dbt_parse_sql (Dbt *dbt, xmlNodePtr xnode) ret = TRUE; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); if (!GDA_IS_SQL_PARSER (priv->gda_parser)) { @@ -708,9 +707,9 @@ dbt_parse_sql (Dbt *dbt, xmlNodePtr xnode) } static gboolean -dbt_parse_gda_op (Dbt *dbt, xmlNodePtr xnode) +zak_dbt_dbt_parse_gda_op (ZakDbtDbt *dbt, xmlNodePtr xnode) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gboolean ret; @@ -723,7 +722,7 @@ dbt_parse_gda_op (Dbt *dbt, xmlNodePtr xnode) ret = TRUE; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); cur = xnode->children; while (cur != NULL && ret) @@ -796,9 +795,9 @@ dbt_parse_gda_op (Dbt *dbt, xmlNodePtr xnode) } static gboolean -dbt_parse_drop_table (Dbt *dbt, xmlNodePtr xnode) +zak_dbt_dbt_parse_drop_table (ZakDbtDbt *dbt, xmlNodePtr xnode) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gboolean ret; @@ -809,7 +808,7 @@ dbt_parse_drop_table (Dbt *dbt, xmlNodePtr xnode) ret = TRUE; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); table_name = NULL; cur = xnode->children; @@ -864,9 +863,9 @@ dbt_parse_drop_table (Dbt *dbt, xmlNodePtr xnode) } static gboolean -dbt_parse_rename_table (Dbt *dbt, xmlNodePtr xnode) +zak_dbt_dbt_parse_rename_table (ZakDbtDbt *dbt, xmlNodePtr xnode) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gboolean ret; @@ -878,7 +877,7 @@ dbt_parse_rename_table (Dbt *dbt, xmlNodePtr xnode) ret = TRUE; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); table_name = NULL; new_table_name = NULL; @@ -930,9 +929,9 @@ dbt_parse_rename_table (Dbt *dbt, xmlNodePtr xnode) } static gboolean -dbt_parse_drop_view (Dbt *dbt, xmlNodePtr xnode) +zak_dbt_dbt_parse_drop_view (ZakDbtDbt *dbt, xmlNodePtr xnode) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gboolean ret; @@ -943,7 +942,7 @@ dbt_parse_drop_view (Dbt *dbt, xmlNodePtr xnode) ret = TRUE; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); view_name = NULL; cur = xnode->children; @@ -998,9 +997,9 @@ dbt_parse_drop_view (Dbt *dbt, xmlNodePtr xnode) } static gboolean -dbt_parse_rename_view (Dbt *dbt, xmlNodePtr xnode) +zak_dbt_dbt_parse_rename_view (ZakDbtDbt *dbt, xmlNodePtr xnode) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gboolean ret; @@ -1012,7 +1011,7 @@ dbt_parse_rename_view (Dbt *dbt, xmlNodePtr xnode) ret = TRUE; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); view_name = NULL; cur = xnode->children; @@ -1072,9 +1071,9 @@ dbt_parse_rename_view (Dbt *dbt, xmlNodePtr xnode) } static gboolean -dbt_parse_create_index (Dbt *dbt, xmlNodePtr xnode) +zak_dbt_dbt_parse_create_index (ZakDbtDbt *dbt, xmlNodePtr xnode) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gboolean ret; @@ -1088,7 +1087,7 @@ dbt_parse_create_index (Dbt *dbt, xmlNodePtr xnode) ret = TRUE; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); index_name = NULL; table_name = NULL; @@ -1190,9 +1189,9 @@ g_debug("%s",gda_server_provider_render_operation(priv->gda_provider, priv->gda_ } static gboolean -dbt_parse_drop_index (Dbt *dbt, xmlNodePtr xnode) +zak_dbt_dbt_parse_drop_index (ZakDbtDbt *dbt, xmlNodePtr xnode) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; gboolean ret; @@ -1204,7 +1203,7 @@ dbt_parse_drop_index (Dbt *dbt, xmlNodePtr xnode) ret = TRUE; - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); index_name = NULL; @@ -1252,14 +1251,14 @@ dbt_parse_drop_index (Dbt *dbt, xmlNodePtr xnode) } /** - * dbt_transform: + * zak_dbt_dbt_transform: * @dbt: * */ void -dbt_transform (Dbt *dbt) +zak_dbt_dbt_transform (ZakDbtDbt *dbt) { - DbtPrivate *priv; + ZakDbtDbtPrivate *priv; xmlXPathContextPtr xpcontext; xmlXPathObjectPtr xpresult; xmlNodeSetPtr xnodeset; @@ -1273,14 +1272,14 @@ dbt_transform (Dbt *dbt) guint i; - g_return_if_fail (IS_DBT (dbt)); + g_return_if_fail (ZAK_DBT_IS_DBT (dbt)); - priv = DBT_GET_PRIVATE (dbt); + priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); g_return_if_fail (priv->gda_conn != NULL); g_return_if_fail (priv->xml_root != NULL); - if (!dbt_check_db (dbt, TRUE)) + if (!zak_dbt_dbt_check_db (dbt, TRUE)) { return; } @@ -1311,7 +1310,7 @@ dbt_transform (Dbt *dbt) continue; } - if (dbt_check_to_execute (dbt, id)) + if (zak_dbt_dbt_check_to_execute (dbt, id)) { /* starting the transaction */ if (gda_connection_supports_feature (priv->gda_conn, GDA_CONNECTION_FEATURE_TRANSACTIONS)) @@ -1332,35 +1331,35 @@ dbt_transform (Dbt *dbt) { if (xmlStrcmp (xnode->name, (const xmlChar *)"sql") == 0) { - tosave = dbt_parse_sql (dbt, xnode); + tosave = zak_dbt_dbt_parse_sql (dbt, xnode); } else if (xmlStrcmp (xnode->name, (const xmlChar *)"gda_op") == 0) { - tosave = dbt_parse_gda_op (dbt, xnode); + tosave = zak_dbt_dbt_parse_gda_op (dbt, xnode); } else if (xmlStrcmp (xnode->name, (const xmlChar *)"drop_table") == 0) { - tosave = dbt_parse_drop_table (dbt, xnode); + tosave = zak_dbt_dbt_parse_drop_table (dbt, xnode); } else if (xmlStrcmp (xnode->name, (const xmlChar *)"rename_table") == 0) { - tosave = dbt_parse_rename_table (dbt, xnode); + tosave = zak_dbt_dbt_parse_rename_table (dbt, xnode); } else if (xmlStrcmp (xnode->name, (const xmlChar *)"drop_view") == 0) { - tosave = dbt_parse_drop_view (dbt, xnode); + tosave = zak_dbt_dbt_parse_drop_view (dbt, xnode); } else if (xmlStrcmp (xnode->name, (const xmlChar *)"rename_view") == 0) { - tosave = dbt_parse_rename_view (dbt, xnode); + tosave = zak_dbt_dbt_parse_rename_view (dbt, xnode); } else if (xmlStrcmp (xnode->name, (const xmlChar *)"create_index") == 0) { - tosave = dbt_parse_create_index (dbt, xnode); + tosave = zak_dbt_dbt_parse_create_index (dbt, xnode); } else if (xmlStrcmp (xnode->name, (const xmlChar *)"drop_index") == 0) { - tosave = dbt_parse_drop_index (dbt, xnode); + tosave = zak_dbt_dbt_parse_drop_index (dbt, xnode); } else { @@ -1380,7 +1379,7 @@ dbt_transform (Dbt *dbt) xbuf = xmlBufferCreate (); xmlNodeDump (xbuf, priv->xml_doc, xnodeset->nodeTab[i], 0, 0); operation = g_strstrip (g_strdup (xbuf->content)); - tosave = dbt_save_transformation (dbt, id, g_strstrip (operation)); + tosave = zak_dbt_dbt_save_transformation (dbt, id, g_strstrip (operation)); } /* ending transaction */ @@ -1407,14 +1406,14 @@ dbt_transform (Dbt *dbt) /* PRIVATE */ static void -dbt_set_property (GObject *object, +zak_dbt_dbt_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - Dbt *dbt = (Dbt *)object; + ZakDbtDbt *dbt = (ZakDbtDbt *)object; - DbtPrivate *priv = DBT_GET_PRIVATE (dbt); + ZakDbtDbtPrivate *priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); switch (property_id) { @@ -1425,14 +1424,14 @@ dbt_set_property (GObject *object, } static void -dbt_get_property (GObject *object, +zak_dbt_dbt_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - Dbt *dbt = (Dbt *)object; + ZakDbtDbt *dbt = (ZakDbtDbt *)object; - DbtPrivate *priv = DBT_GET_PRIVATE (dbt); + ZakDbtDbtPrivate *priv = ZAK_DBT_DBT_GET_PRIVATE (dbt); switch (property_id) { diff --git a/src/libzakdbt.h b/src/libzakdbt.h index c9aeaeb..c9b1ef3 100644 --- a/src/libzakdbt.h +++ b/src/libzakdbt.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2018 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBDBT_H__ -#define __LIBDBT_H__ +#ifndef __LIBZAKDBT_H__ +#define __LIBZAKDBT_H__ #include #include @@ -27,44 +27,44 @@ G_BEGIN_DECLS -#define TYPE_DBT (dbt_get_type ()) -#define DBT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DBT, Dbt)) -#define DBT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DBT, DbtClass)) -#define IS_DBT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DBT)) -#define IS_DBT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DBT)) -#define DBT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DBT, DbtClass)) +#define ZAK_DBT_TYPE_DBT (zak_dbt_dbt_get_type ()) +#define ZAK_DBT_DBT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_DBT_TYPE_DBT, ZakDbtDbt)) +#define ZAK_DBT_DBT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_DBT_TYPE_DBT, ZakDbtDbtClass)) +#define ZAK_DBT_IS_DBT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_DBT_TYPE_DBT)) +#define ZAK_DBT_IS_DBT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_DBT_TYPE_DBT)) +#define ZAK_DBT_DBT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_DBT_TYPE_DBT, ZakDbtDbtClass)) -typedef struct _Dbt Dbt; -typedef struct _DbtClass DbtClass; +typedef struct _ZakDbtDbt ZakDbtDbt; +typedef struct _ZakDbtDbtClass ZakDbtDbtClass; -struct _Dbt +struct _ZakDbtDbt { GObject parent; }; -struct _DbtClass +struct _ZakDbtDbtClass { GObjectClass parent_class; }; -GType dbt_get_type (void) G_GNUC_CONST; +GType zak_dbt_dbt_get_type (void) G_GNUC_CONST; -Dbt *dbt_new (void); +ZakDbtDbt *zak_dbt_dbt_new (void); -void dbt_set_db_connection (Dbt *dbt, GdaConnection *gda_conn); -void dbt_set_db_connection_from_string (Dbt *dbt, const gchar *cnc_string); +void zak_dbt_dbt_set_db_connection (ZakDbtDbt *zak_dbt_dbt, GdaConnection *gda_conn); +void zak_dbt_dbt_set_db_connection_from_string (ZakDbtDbt *zak_dbt_dbt, const gchar *cnc_string); -void dbt_set_xml (Dbt *dbt, xmlNodePtr xml_root); -void dbt_set_xml_from_filename (Dbt *dbt, const gchar *filename); +void zak_dbt_dbt_set_xml (ZakDbtDbt *zak_dbt_dbt, xmlNodePtr xml_root); +void zak_dbt_dbt_set_xml_from_filename (ZakDbtDbt *zak_dbt_dbt, const gchar *filename); -gboolean dbt_db_is_updated (Dbt *dbt); +gboolean zak_dbt_dbt_db_is_updated (ZakDbtDbt *zak_dbt_dbt); -void dbt_transform (Dbt *dbt); +void zak_dbt_dbt_transform (ZakDbtDbt *zak_dbt_dbt); G_END_DECLS -#endif /* __LIBDBT_H__ */ +#endif /* __LIBZAKDBT_H__ */ diff --git a/tests/test.c b/tests/test.c index 98a8620..f776458 100644 --- a/tests/test.c +++ b/tests/test.c @@ -18,17 +18,17 @@ #include "libzakdbt.h" -Dbt *dbt; +ZakDbtDbt *dbt; int main (int argc, char **argv) { - dbt = dbt_new (); + dbt = zak_dbt_dbt_new (); - dbt_set_db_connection_from_string (dbt, "SQLite://DB_DIR=tests;DB_NAME=test.db"); - dbt_set_xml_from_filename (dbt, "tests/test.xml"); + zak_dbt_dbt_set_db_connection_from_string (dbt, "SQLite://DB_DIR=tests;DB_NAME=test.db"); + zak_dbt_dbt_set_xml_from_filename (dbt, "tests/test.xml"); - if (dbt_db_is_updated (dbt)) + if (zak_dbt_dbt_db_is_updated (dbt)) { g_message ("Database is updated."); return 0; @@ -38,7 +38,7 @@ main (int argc, char **argv) g_message ("Database is not updated."); } - dbt_transform (dbt); + zak_dbt_dbt_transform (dbt); return 0; } -- 2.49.0