You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2007/01/04 09:30:16 UTC

svn commit: r492446 [2/2] - in /webservices/sandesha/trunk/c: include/ src/storage/permanent/

Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c?view=diff&rev=492446&r1=492445&r2=492446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c Thu Jan  4 00:30:15 2007
@@ -39,79 +39,130 @@
 #define SANDESHA2_INTF_TO_IMPL(invoker_mgr) \
     ((sandesha2_permanent_invoker_mgr_t *) invoker_mgr)
 
-static int 
-sandesha2_invoker_find_callback(
-    void *not_used, 
-    int argc, 
-    char **argv, 
-    char **col_name)
-{
-    int i = 0;
-    sandesha2_invoker_bean_t *bean = NULL;
-    sandesha2_bean_mgr_args_t *args = (sandesha2_bean_mgr_args_t *) not_used;
-    const axis2_env_t *env = args->env;
-    axis2_array_list_t *data_list = (axis2_array_list_t *) args->data;
-    if(argc < 1)
+axis2_status_t 
+sandesha2_invoker_retrieve_callback(
+    const axis2_env_t *env,
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    void *key,
+    axis2_array_list_t *data_list)
+{
+    int rc = -1;
+    sandesha2_invoker_bean_t *bean = (sandesha2_invoker_bean_t *) 
+        sandesha2_invoker_bean_create(env);
+    axis2_char_t *msg_ctx_ref_key = (axis2_char_t *) key;
+    if(msg_ctx_ref_key)
     {
-        args->data = NULL;
-        return 0;
+        if (sqlite3_bind_text(stmt, 1, msg_ctx_ref_key, 
+            axis2_strlen(msg_ctx_ref_key), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
     }
-    if(!data_list)
+    rc = sqlite3_step(stmt);
+    if(rc == SQLITE_BUSY)
     {
-        data_list = axis2_array_list_create(env, 0);
-        args->data = data_list;
+        if(busy_handler(stmt, rc) != SQLITE_OK)
+        {
+            return AXIS2_FAILURE;
+        }
     }
-    bean = sandesha2_invoker_bean_create(env);
-    for(i = 0; i < argc; i++)
+    while(rc == SQLITE_ROW)
     {
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_ctx_ref_key"))
-            sandesha2_invoker_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_no"))
-            sandesha2_invoker_bean_set_msg_no(bean, env, atol(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
-            if(argv[i])
-                sandesha2_invoker_bean_set_seq_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "is_invoked"))
-            sandesha2_invoker_bean_set_invoked(bean, env, AXIS2_ATOI(argv[i]));
+        sandesha2_invoker_bean_set_msg_ctx_ref_key(bean, env,
+            (axis2_char_t *) sqlite3_column_text(stmt, 0));
+        sandesha2_invoker_bean_set_msg_no(bean, env, 
+            sqlite3_column_int64(stmt, 1));
+        sandesha2_invoker_bean_set_seq_id(bean, env, 
+            (axis2_char_t *) sqlite3_column_text(stmt, 2));
+        sandesha2_invoker_bean_set_invoked(bean, env,
+            sqlite3_column_int(stmt, 3));
+        rc = sqlite3_step(stmt);
+        if(rc == SQLITE_BUSY)
+        {
+            if(busy_handler(stmt, rc) != SQLITE_OK)
+            {
+                return AXIS2_FAILURE;
+            }
+        }
     }
     axis2_array_list_add(data_list, env, bean);
-    return 0;
+    return AXIS2_SUCCESS;
 }
 
-static int 
-sandesha2_invoker_retrieve_callback(
-    void *not_used, 
-    int argc, 
-    char **argv, 
-    char **col_name)
-{
-    int i = 0;
-    sandesha2_bean_mgr_args_t *args = (sandesha2_bean_mgr_args_t *) not_used;
-    const axis2_env_t *env = args->env;
-    sandesha2_invoker_bean_t *bean = (sandesha2_invoker_bean_t *) args->data;
-    if(argc < 1)
+static axis2_status_t
+sandesha2_invoker_remove_callback(
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    void *key)
+{
+    int rc = -1;
+    axis2_char_t *msg_ctx_ref_key = (axis2_char_t *) key;
+    if (sqlite3_bind_text(stmt, 1, msg_ctx_ref_key, 
+        axis2_strlen(msg_ctx_ref_key), SQLITE_STATIC))
     {
-        args->data = NULL;
-        return 0;
+        return AXIS2_FAILURE;
     }
-    if(!bean)
+    rc = sqlite3_step(stmt);
+    if (rc == SQLITE_BUSY)
     {
-        bean = sandesha2_invoker_bean_create(env);
-        args->data = bean;
+        if(busy_handler(stmt, rc) != SQLITE_OK)
+        {
+            return AXIS2_FAILURE;
+        }
     }
-    for(i = 0; i < argc; i++)
+    else if (rc == SQLITE_DONE)
+        return AXIS2_SUCCESS;
+    return AXIS2_FAILURE;
+}
+
+static axis2_status_t 
+sandesha2_invoker_update_or_insert_callback(
+    const axis2_env_t *env,
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    sandesha2_rm_bean_t *invoker_bean)
+{
+    sandesha2_invoker_bean_t *bean = (sandesha2_invoker_bean_t *) invoker_bean;
+    if(!bean)
+        return AXIS2_FAILURE;
     {
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_ctx_ref_key"))
-            sandesha2_invoker_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_no"))
-            sandesha2_invoker_bean_set_msg_no(bean, env, atol(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
-            if(argv[i])
-                sandesha2_invoker_bean_set_seq_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "is_invoked"))
-            sandesha2_invoker_bean_set_invoked(bean, env, AXIS2_ATOI(argv[i]));
+        int rc = -1;
+        axis2_char_t *msg_ctx_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
+            (sandesha2_rm_bean_t *) bean, env);
+        long msg_no = sandesha2_invoker_bean_get_msg_no(bean, env);
+        axis2_char_t *seq_id = sandesha2_invoker_bean_get_seq_id(bean, env);
+        axis2_bool_t is_invoked = sandesha2_invoker_bean_is_invoked(bean, env);
+ 
+        if (sqlite3_bind_int64(stmt, 1, msg_no))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 2, seq_id, axis2_strlen(seq_id), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_int(stmt, 3, is_invoked))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 4, msg_ctx_ref_key, 
+            axis2_strlen(msg_ctx_ref_key), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        rc = sqlite3_step(stmt);
+        if (rc == SQLITE_BUSY)
+        {
+            if(busy_handler(stmt, rc) != SQLITE_OK)
+            {
+                return AXIS2_FAILURE;
+            }
+        }
+        else if (rc == SQLITE_DONE)
+            return AXIS2_SUCCESS;
     }
-    return 0;
+    return AXIS2_FAILURE;
 }
 
 static int 
@@ -232,42 +283,28 @@
     axis2_char_t *sql_insert = NULL;
     axis2_char_t *sql_retrieve = NULL;
     axis2_char_t *sql_update = NULL;
+    axis2_char_t *msg_ctx_ref_key = NULL; 
     axis2_bool_t ret = AXIS2_FALSE;
     sandesha2_permanent_invoker_mgr_t *invoker_mgr_impl = NULL;
     invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
 
-    axis2_char_t *msg_ctx_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
-        (sandesha2_rm_bean_t *) bean, env);
-    axis2_char_t str_msg_ctx_ref_key[msg_ctx_ref_key?AXIS2_STRLEN(msg_ctx_ref_key):8];
-    long msg_no = sandesha2_invoker_bean_get_msg_no(bean, env);
-    axis2_char_t str_msg_no[32];
-    axis2_char_t *seq_id = sandesha2_invoker_bean_get_seq_id(bean, env);
-    axis2_char_t str_seq_id[seq_id?AXIS2_STRLEN(seq_id):8];
-    axis2_bool_t is_invoked = sandesha2_invoker_bean_is_invoked(bean, env);
-    axis2_char_t str_is_invoked[32];
-
-    sprintf(str_msg_ctx_ref_key, "'%s'", msg_ctx_ref_key);
-    sprintf(str_msg_no, "%ld", msg_no); 
-    sprintf(str_seq_id, seq_id?"'%s'":"NULL", seq_id);
-    sprintf(str_is_invoked, "%d", is_invoked); 
-
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Entry:sandesha2_permanent_invoker_mgr_insert");
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
 
-    sql_retrieve = axis2_strcat(env, "select msg_ctx_ref_key, msg_no, "\
-        "seq_id, is_invoked from invoker "\
-        "where msg_ctx_ref_key=", str_msg_ctx_ref_key, ";", NULL);
-    sql_update = axis2_strcat(env, "update invoker set msg_no=", 
-        str_msg_no, ", seq_id=", str_seq_id, ", is_invoked=", 
-            str_is_invoked, " where msg_ctx_ref_key=", str_msg_ctx_ref_key, 
-            ";", NULL);
-    sql_insert = axis2_strcat(env, "insert into invoker(msg_ctx_ref_key, "\
-        "msg_no, seq_id, is_invoked) values(", str_msg_ctx_ref_key, ",", 
-        str_msg_no, ",", str_seq_id, ",", str_is_invoked, ");", NULL);
+    msg_ctx_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
+        (sandesha2_rm_bean_t *) bean, env);
+    sql_retrieve = "select msg_ctx_ref_key, msg_no, "\
+        "seq_id, is_invoked from invoker where msg_ctx_ref_key=?";
+    sql_update = "update invoker set msg_no=?, seq_id=?,"\
+        "is_invoked=? where msg_ctx_ref_key= ?";
+    sql_insert = "insert into invoker(msg_no, seq_id, is_invoked, "\
+        "msg_ctx_ref_key) values(?,?,?,?)";
     ret = sandesha2_permanent_bean_mgr_insert(invoker_mgr_impl->bean_mgr, env,
-        (sandesha2_rm_bean_t *) bean, sandesha2_invoker_retrieve_callback, 
+        (void *)msg_ctx_ref_key, (sandesha2_rm_bean_t *) bean, 
+        sandesha2_invoker_retrieve_callback, 
+        sandesha2_invoker_update_or_insert_callback,
         sql_retrieve, sql_update, sql_insert);
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Exit:sandesha2_permanent_invoker_mgr_insert");
@@ -287,13 +324,14 @@
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, key, AXIS2_FALSE);
     invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
-    sql_remove = axis2_strcat(env, "delete from invoker where msg_ctx_ref_key='",
-        key, "';", NULL);
-    sql_retrieve = axis2_strcat(env, "select msg_ctx_ref_key, msg_no, "\
+    sql_remove = "delete from invoker where msg_ctx_ref_key=?";
+    sql_retrieve = "select msg_ctx_ref_key, msg_no, "\
         "seq_id, is_invoked from invoker "\
-        "where msg_ctx_ref_key='", key, "';", NULL);
+        "where msg_ctx_ref_key=?";
     return sandesha2_permanent_bean_mgr_remove(invoker_mgr_impl->bean_mgr, env, 
-        sandesha2_invoker_retrieve_callback, sql_retrieve, sql_remove);
+        (void *) key, sandesha2_invoker_retrieve_callback, 
+        sandesha2_invoker_remove_callback, 
+        sql_retrieve, sql_remove);
 }
 
 sandesha2_invoker_bean_t *AXIS2_CALL
@@ -309,11 +347,10 @@
     AXIS2_PARAM_CHECK(env->error, key, AXIS2_FALSE);
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Entry:sandesha2_permanent_invoker_mgr_retrieve");
-    sql_retrieve = axis2_strcat(env, "select msg_ctx_ref_key, msg_no, "\
-        "seq_id, is_invoked from invoker "\
-        "where msg_ctx_ref_key='", key, "';", NULL);
+    sql_retrieve = "select msg_ctx_ref_key, msg_no, seq_id, "\
+        "is_invoked from invoker where msg_ctx_ref_key=?";
     sandesha2_permanent_bean_mgr_retrieve(invoker_mgr_impl->bean_mgr, env, 
-        sandesha2_invoker_retrieve_callback, sql_retrieve);
+        (void *) key, sandesha2_invoker_retrieve_callback, sql_retrieve);
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Entry:sandesha2_permanent_invoker_mgr_retrieve");
     return bean;
@@ -325,41 +362,28 @@
     const axis2_env_t *env,
     sandesha2_invoker_bean_t *bean)
 {
-    axis2_char_t *ref_key = NULL;
+    axis2_char_t *msg_ctx_ref_key = NULL;
     axis2_char_t *sql_update = NULL;
     axis2_char_t *sql_retrieve = NULL;
     axis2_bool_t ret = AXIS2_FALSE;
     sandesha2_permanent_invoker_mgr_t *invoker_mgr_impl = NULL;
 
-    axis2_char_t *msg_ctx_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
+    msg_ctx_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
         (sandesha2_rm_bean_t *) bean, env);
-    axis2_char_t str_msg_ctx_ref_key[msg_ctx_ref_key?AXIS2_STRLEN(msg_ctx_ref_key):8];
-    long msg_no = sandesha2_invoker_bean_get_msg_no(bean, env);
-    axis2_char_t str_msg_no[32];
-    axis2_char_t seq_id = sandesha2_invoker_bean_get_seq_id(bean, env);
-    axis2_char_t str_seq_id[seq_id?AXIS2_STRLEN(seq_id):8];
-    axis2_bool_t is_invoked = sandesha2_invoker_bean_is_invoked(bean, env);
-    axis2_char_t str_is_invoked[32];
-
-    sprintf(str_msg_ctx_ref_key, "'%s'", msg_ctx_ref_key);
-    sprintf(str_msg_no, "%ld", msg_no); 
-    sprintf(str_seq_id, seq_id?"'%s'":"NULL", seq_id);
-    sprintf(str_is_invoked, "%d", is_invoked); 
 
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Entry:sandesha2_permanent_invoker_mgr_update");
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
 
-    sql_retrieve = axis2_strcat(env, "select msg_ctx_ref_key, msg_no, "\
-        "seq_id, is_invoked from invoker "\
-        "where msg_ctx_ref_key=", str_msg_ctx_ref_key, ";", NULL);
-    sql_update = axis2_strcat(env, "update invoker set msg_no=", 
-        str_msg_no, ", seq_id=", str_seq_id, ", is_invoked=", 
-            str_is_invoked, " where msg_ctx_ref_key=", str_msg_ctx_ref_key, 
-            ";", NULL);
+    sql_retrieve = "select msg_ctx_ref_key, msg_no, "\
+        "seq_id, is_invoked from invoker where msg_ctx_ref_key=?";
+    sql_update = "update invoker set msg_no=?, seq_id=?, is_invoked=?"\
+        " where msg_ctx_ref_key=?";
     ret = sandesha2_permanent_bean_mgr_update(invoker_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *)bean, sandesha2_invoker_retrieve_callback, 
+        (void *)msg_ctx_ref_key, (sandesha2_rm_bean_t *)bean, 
+        sandesha2_invoker_retrieve_callback, 
+        sandesha2_invoker_update_or_insert_callback, 
         sql_retrieve, sql_update);
 
     AXIS2_LOG_INFO(env->log, 
@@ -381,12 +405,11 @@
         "[sandesha2]Entry:sandesha2_permanent_invoker_mgr_find");
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
-    sql_find = axis2_strcat(env, "select msg_ctx_ref_key,msg_no,"\
-        "seq_id,is_invoked from invoker;", 
-        NULL);
+    sql_find = "select msg_ctx_ref_key,msg_no,"\
+        "seq_id,is_invoked from invoker;";
     sql_count = "select count(*) as no_recs from invoker;";
     ret = sandesha2_permanent_bean_mgr_find(invoker_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *) bean, sandesha2_invoker_find_callback,
+        (sandesha2_rm_bean_t *) bean, sandesha2_invoker_retrieve_callback,
         sandesha2_invoker_count_callback, sql_find, sql_count);
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Exit:sandesha2_permanent_invoker_mgr_find");
@@ -405,13 +428,12 @@
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
-    sql_find = axis2_strcat(env, "select msg_ctx_ref_key,msg_no,"\
-        "seq_id,is_invoked from invoker;", 
-        NULL);
+    sql_find = "select msg_ctx_ref_key,msg_no,"\
+        "seq_id,is_invoked from invoker;";
     sql_count = "select count(*) as no_recs from invoker;";
     return (sandesha2_invoker_bean_t *) sandesha2_permanent_bean_mgr_find_unique(
         invoker_mgr_impl->bean_mgr, env, (sandesha2_rm_bean_t *) bean, 
-        sandesha2_invoker_find_callback, sandesha2_invoker_count_callback, 
+        sandesha2_invoker_retrieve_callback, sandesha2_invoker_count_callback, 
         sql_find, sql_count);
 }
 

Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c?view=diff&rev=492446&r1=492445&r2=492446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c Thu Jan  4 00:30:15 2007
@@ -41,85 +41,130 @@
 #define SANDESHA2_INTF_TO_IMPL(next_msg_mgr) \
     ((sandesha2_permanent_next_msg_mgr_t *) next_msg_mgr)
 
-static int 
-sandesha2_next_msg_find_callback(
-    void *not_used, 
-    int argc, 
-    char **argv, 
-    char **col_name)
-{
-    int i = 0;
-    sandesha2_next_msg_bean_t *bean = NULL;
-    sandesha2_bean_mgr_args_t *args = (sandesha2_bean_mgr_args_t *) not_used;
-    const axis2_env_t *env = args->env;
-    axis2_array_list_t *data_list = (axis2_array_list_t *) args->data;
-    if(argc < 1)
+axis2_status_t 
+sandesha2_next_msg_retrieve_callback(
+    const axis2_env_t *env,
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    void *key,
+    axis2_array_list_t *data_list)
+{
+    int rc = -1;
+    sandesha2_next_msg_bean_t *bean = (sandesha2_next_msg_bean_t *) 
+        sandesha2_next_msg_bean_create(env);
+    axis2_char_t *seq_id = (axis2_char_t *) key;
+    if(seq_id)
     {
-        args->data = NULL;
-        return 0;
+        if (sqlite3_bind_text(stmt, 1, seq_id, 
+            axis2_strlen(seq_id), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
     }
-    if(!data_list)
+    rc = sqlite3_step(stmt);
+    if(rc == SQLITE_BUSY)
     {
-        data_list = axis2_array_list_create(env, 0);
-        args->data = data_list;
+        if(busy_handler(stmt, rc) != SQLITE_OK)
+        {
+            return AXIS2_FAILURE;
+        }
     }
-    bean = sandesha2_next_msg_bean_create(env);
-    for(i = 0; i < argc; i++)
+    while(rc == SQLITE_ROW)
     {
-        if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
-            sandesha2_next_msg_bean_set_seq_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "ref_msg_key"))
-            if(argv[i])
-                sandesha2_next_msg_bean_set_ref_msg_key(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "polling_mode"))
-            sandesha2_next_msg_bean_set_polling_mode(bean, env, 
-                AXIS2_ATOI(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_no"))
-            sandesha2_next_msg_bean_set_next_msg_no_to_process(bean, env, 
-                atol(argv[i]));
+        sandesha2_next_msg_bean_set_seq_id(bean, env, 
+            (axis2_char_t *) sqlite3_column_text(stmt, 0));
+        sandesha2_next_msg_bean_set_ref_msg_key(bean, env,
+            (axis2_char_t *) sqlite3_column_text(stmt, 1));
+        sandesha2_next_msg_bean_set_polling_mode(bean, env,
+            sqlite3_column_int(stmt, 2));
+        sandesha2_next_msg_bean_set_msg_no(bean, env,
+            sqlite3_column_int64(stmt, 3));
+        rc = sqlite3_step(stmt);
+        if(rc == SQLITE_BUSY)
+        {
+            if(busy_handler(stmt, rc) != SQLITE_OK)
+            {
+                return AXIS2_FAILURE;
+            }
+        }
     }
     axis2_array_list_add(data_list, env, bean);
-    return 0;
+    return AXIS2_SUCCESS;
 }
 
-static int 
-sandesha2_next_msg_retrieve_callback(
-    void *not_used, 
-    int argc, 
-    char **argv, 
-    char **col_name)
-{
-    int i = 0;
-    sandesha2_bean_mgr_args_t *args = (sandesha2_bean_mgr_args_t *) not_used;
-    const axis2_env_t *env = args->env;
-    sandesha2_next_msg_bean_t *bean = (sandesha2_next_msg_bean_t *) args->data;
-    if(argc < 1)
+static axis2_status_t
+sandesha2_next_msg_remove_callback(
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    void *key)
+{
+    int rc = -1;
+    axis2_char_t *seq_id = (axis2_char_t *) key;
+    if (sqlite3_bind_text(stmt, 1, seq_id, 
+        axis2_strlen(seq_id), SQLITE_STATIC))
     {
-        args->data = NULL;
-        return 0;
+        return AXIS2_FAILURE;
     }
-    if(!bean)
+    rc = sqlite3_step(stmt);
+    if (rc == SQLITE_BUSY)
     {
-        bean = sandesha2_next_msg_bean_create(env);
-        args->data = bean;
+        if(busy_handler(stmt, rc) != SQLITE_OK)
+        {
+            return AXIS2_FAILURE;
+        }
     }
-    for(i = 0; i < argc; i++)
+    else if (rc == SQLITE_DONE)
+        return AXIS2_SUCCESS;
+    return AXIS2_FAILURE;
+}
+
+static axis2_status_t 
+sandesha2_next_msg_update_or_insert_callback(
+    const axis2_env_t *env,
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    sandesha2_rm_bean_t *next_msg_bean)
+{
+    sandesha2_next_msg_bean_t *bean = (sandesha2_next_msg_bean_t *) next_msg_bean;
+    if(!bean)
+        return AXIS2_FAILURE;
     {
-        if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
-            sandesha2_next_msg_bean_set_seq_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "ref_msg_key"))
-            if(argv[i])
-                sandesha2_next_msg_bean_set_ref_msg_key(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "polling_mode"))
+        int rc = -1;
+        axis2_char_t *seq_id = sandesha2_next_msg_bean_get_seq_id((sandesha2_rm_bean_t *) bean, 
+            env);
+        axis2_char_t *ref_msg_key = sandesha2_next_msg_bean_get_ref_msg_key(bean, env);
+        axis2_bool_t polling_mode = sandesha2_next_msg_bean_is_polling_mode(bean, env);
+        long msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(bean, env);
+          
+        if (sqlite3_bind_text(stmt, 1, ref_msg_key, 
+            axis2_strlen(ref_msg_key), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_int(stmt, 2, polling_mode))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_int64(stmt, 3, msg_no))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 4, seq_id, axis2_strlen(seq_id), SQLITE_STATIC))
         {
-            sandesha2_next_msg_bean_set_polling_mode(bean, env, 
-                AXIS2_ATOI(argv[i]));
+            return AXIS2_FAILURE;
         }
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_no"))
-            sandesha2_next_msg_bean_set_next_msg_no_to_process(bean, env, 
-                atol(argv[i]));
+        rc = sqlite3_step(stmt);
+        if (rc == SQLITE_BUSY)
+        {
+            if(busy_handler(stmt, rc) != SQLITE_OK)
+            {
+                return AXIS2_FAILURE;
+            }
+        }
+        else if (rc == SQLITE_DONE)
+            return AXIS2_SUCCESS;
     }
-    return 0;
+    return AXIS2_FAILURE;
 }
 
 static int 
@@ -258,39 +303,25 @@
     axis2_char_t *sql_insert = NULL;
     axis2_char_t *sql_retrieve = NULL;
     axis2_char_t *sql_update = NULL;
+    axis2_char_t *seq_id = NULL; 
     sandesha2_permanent_next_msg_mgr_t *next_msg_mgr_impl = NULL;
 
-    axis2_char_t *seq_id = sandesha2_next_msg_bean_get_seq_id((sandesha2_rm_bean_t *) bean, 
-        env);
-    axis2_char_t str_seq_id[AXIS2_STRLEN(seq_id)];
-    axis2_char_t *ref_msg_key = sandesha2_next_msg_bean_get_ref_msg_key(bean, env);
-    axis2_char_t str_ref_msg_key[ref_msg_key?AXIS2_STRLEN(ref_msg_key):8];
-    axis2_bool_t polling_mode = sandesha2_next_msg_bean_is_polling_mode(bean, env);
-    axis2_char_t str_polling_mode[32];
-    long msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(bean, env);
-    axis2_char_t str_msg_no[32];
-
-    sprintf(str_seq_id, "'%s'", seq_id);
-    sprintf(str_ref_msg_key, ref_msg_key?"'%s'":"NULL", ref_msg_key);
-    sprintf(str_polling_mode, "%d", polling_mode);  
-    sprintf(str_msg_no, "%ld", msg_no);
-
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
 
-    sql_retrieve = axis2_strcat(env, "select seq_id, ref_msg_key, "\
-        "polling_mode, msg_no from next_msg "\
-        "where seq_id='", seq_id, "';", NULL);
-    sql_update = axis2_strcat(env, "update next_msg set ref_msg_key=", 
-        str_ref_msg_key, ", polling_mode=", str_polling_mode, 
-        ", msg_no=", str_msg_no, " where seq_id=", str_seq_id, ";", NULL);
-    sql_insert = axis2_strcat(env, "insert into next_msg(seq_id, "\
-        "ref_msg_key, polling_mode, msg_no) values(", str_seq_id, 
-        ",", str_ref_msg_key, ",", str_polling_mode, ",", 
-        str_msg_no, ");", NULL);
+    seq_id = sandesha2_next_msg_bean_get_seq_id((sandesha2_rm_bean_t *) bean, 
+        env);
+    sql_retrieve = "select seq_id, ref_msg_key, polling_mode, msg_no from"\
+        " next_msg where seq_id=?";
+    sql_update = "update next_msg set ref_msg_key=?, polling_mode=?, msg_no=?"\
+        " where seq_id=?";
+    sql_insert = "insert into next_msg(ref_msg_key, polling_mode,"\
+        "msg_no, seq_id) values(?,?,?,?)";
     return sandesha2_permanent_bean_mgr_insert(next_msg_mgr_impl->bean_mgr, env,
-        (sandesha2_rm_bean_t *) bean, sandesha2_next_msg_retrieve_callback, 
+        (void *) seq_id, (sandesha2_rm_bean_t *) bean, 
+        sandesha2_next_msg_retrieve_callback, 
+        sandesha2_next_msg_update_or_insert_callback, 
         sql_retrieve, sql_update, sql_insert);
 }
 
@@ -308,11 +339,14 @@
     next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
     sql_remove = axis2_strcat(env, "delete from next_msg where seq_id='",
         seq_id, "';", NULL);
-    sql_retrieve = axis2_strcat(env, "select seq_id, ref_msg_key, "\
+    sql_retrieve = "select seq_id, ref_msg_key, "\
         "polling_mode, msg_no from next_msg "\
-        "where seq_id='", seq_id, "';", NULL);
+        "where seq_id=?";
     return sandesha2_permanent_bean_mgr_remove(next_msg_mgr_impl->bean_mgr, env, 
-        sandesha2_next_msg_retrieve_callback, sql_retrieve, sql_remove);
+        (void *) seq_id, 
+        sandesha2_next_msg_retrieve_callback, 
+        sandesha2_next_msg_remove_callback, 
+        sql_retrieve, sql_remove);
 }
 
 sandesha2_next_msg_bean_t *AXIS2_CALL
@@ -328,12 +362,12 @@
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
     next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
-    sql_retrieve = axis2_strcat(env, "select seq_id, ref_msg_key, "\
+    sql_retrieve = "select seq_id, ref_msg_key, "\
         "polling_mode, msg_no from next_msg "\
-        "where seq_id='", seq_id, "';", NULL);
+        "where seq_id=?";
     bean = (sandesha2_next_msg_bean_t *) sandesha2_permanent_bean_mgr_retrieve(
-        next_msg_mgr_impl->bean_mgr, env, sandesha2_next_msg_retrieve_callback, 
-        sql_retrieve);
+        next_msg_mgr_impl->bean_mgr, env, (void *) seq_id,
+        sandesha2_next_msg_retrieve_callback, sql_retrieve);
     return bean;
 }
 
@@ -350,31 +384,20 @@
 
     axis2_char_t *seq_id = sandesha2_next_msg_bean_get_seq_id((sandesha2_rm_bean_t *) bean, 
         env);
-    axis2_char_t str_seq_id[AXIS2_STRLEN(seq_id)];
-    axis2_char_t *ref_msg_key = sandesha2_next_msg_bean_get_ref_msg_key(bean, env);
-    axis2_char_t str_ref_msg_key[ref_msg_key?AXIS2_STRLEN(ref_msg_key):8];
-    axis2_bool_t polling_mode = sandesha2_next_msg_bean_is_polling_mode(bean, env);
-    axis2_char_t str_polling_mode[32];
-    long msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(bean, env);
-    axis2_char_t str_msg_no[32];
-
-    sprintf(str_seq_id, "'%s'", seq_id);
-    sprintf(str_ref_msg_key, ref_msg_key?"'%s'":"NULL", ref_msg_key);
-    sprintf(str_polling_mode, "%d", polling_mode);  
-    sprintf(str_msg_no, "%ld", msg_no);
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
 
-    sql_retrieve = axis2_strcat(env, "select seq_id, ref_msg_key, "\
+    sql_retrieve = "select seq_id, ref_msg_key, "\
         "polling_mode, msg_no from next_msg "\
-        "where seq_id=", str_seq_id, ";", NULL);
-    sql_update = axis2_strcat(env, "update next_msg set ref_msg_key=", 
-        str_ref_msg_key, ", polling_mode=", str_polling_mode, 
-        ", msg_no=", str_msg_no, " where seq_id=", str_seq_id, ";", NULL);
+        "where seq_id=?";
+    sql_update = "update next_msg set ref_msg_key=?, polling_mode=?, msg_no=?,"\
+        " where seq_id=?";
     ret = sandesha2_permanent_bean_mgr_update(next_msg_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *) bean, sandesha2_next_msg_retrieve_callback, 
+        (void *) seq_id, (sandesha2_rm_bean_t *) bean, 
+        sandesha2_next_msg_retrieve_callback, 
+        sandesha2_next_msg_update_or_insert_callback, 
         sql_retrieve, sql_update);
     return ret;
 }
@@ -391,11 +414,11 @@
     sandesha2_permanent_next_msg_mgr_t *next_msg_mgr_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
-    sql_find = axis2_strcat(env, "select seq_id,ref_msg_key,"\
-        "polling_mode,msg_no from next_msg;", NULL);
+    sql_find = "select seq_id,ref_msg_key,"\
+        "polling_mode,msg_no from next_msg;";
     sql_count = "select count(*) as no_recs from next_msg;";
     ret = sandesha2_permanent_bean_mgr_find(next_msg_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *) bean, sandesha2_next_msg_find_callback,
+        (sandesha2_rm_bean_t *) bean, sandesha2_next_msg_retrieve_callback,
         sandesha2_next_msg_count_callback, sql_find, sql_count);
     return ret;
 }
@@ -413,12 +436,12 @@
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
-    sql_find = axis2_strcat(env, "select seq_id,ref_msg_key,"\
-        "polling_mode,msg_no from next_msg;", NULL);
+    sql_find = "select seq_id,ref_msg_key,"\
+        "polling_mode,msg_no from next_msg;";
     sql_count = "select count(*) as no_recs from next_msg;";
     ret = (sandesha2_next_msg_bean_t *) sandesha2_permanent_bean_mgr_find_unique(
         next_msg_mgr_impl->bean_mgr, env, (sandesha2_rm_bean_t *) bean, 
-        sandesha2_next_msg_find_callback, sandesha2_next_msg_count_callback, 
+        sandesha2_next_msg_retrieve_callback, sandesha2_next_msg_count_callback, 
         sql_find, sql_count);
     return ret;
 }

Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c?view=diff&rev=492446&r1=492445&r2=492446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c Thu Jan  4 00:30:15 2007
@@ -27,6 +27,7 @@
 #include <axis2_thread.h>
 #include <axis2_property.h>
 #include <axis2_types.h>
+#include <sqlite3.h>
 
 /** 
  * @brief Sandesha2 Permanent Sender Manager Struct Impl
@@ -41,119 +42,193 @@
 #define SANDESHA2_INTF_TO_IMPL(sender_mgr) \
     ((sandesha2_permanent_sender_mgr_t *) sender_mgr)
 
-static int 
-sandesha2_sender_find_callback(
-    void *not_used, 
-    int argc, 
-    char **argv, 
-    char **col_name)
-{
-    int i = 0;
-    sandesha2_sender_bean_t *bean = NULL;
-    sandesha2_bean_mgr_args_t *args = (sandesha2_bean_mgr_args_t *) not_used;
-    const axis2_env_t *env = args->env;
-    axis2_array_list_t *data_list = (axis2_array_list_t *) args->data;
-    if(argc < 1)
-    {
-        args->data = NULL;
-        return 0;
-    }
-    if(!data_list)
-    {
-        data_list = axis2_array_list_create(env, 0);
-        args->data = data_list;
-    }
-    bean = sandesha2_sender_bean_create(env);
-    for(i = 0; i < argc; i++)
-    {
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_id"))
-            sandesha2_sender_bean_set_msg_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_ctx_ref_key"))
-            if(argv[i])
-                sandesha2_sender_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "internal_seq_ID"))
-            if(argv[i])
-                sandesha2_sender_bean_set_internal_seq_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "sent_count"))
-            sandesha2_sender_bean_set_sent_count(bean, env, AXIS2_ATOI(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_no"))
-            sandesha2_sender_bean_set_msg_no(bean, env, atol(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "send"))
-            sandesha2_sender_bean_set_send(bean, env, AXIS2_ATOI(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "resend"))
-            sandesha2_sender_bean_set_resend(bean, env, AXIS2_ATOI(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "time_to_send"))
-            sandesha2_sender_bean_set_time_to_send(bean, env, atol(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_type"))
-            sandesha2_sender_bean_set_msg_type(bean, env, AXIS2_ATOI(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
-            if(argv[i])
-                sandesha2_sender_bean_set_seq_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "wsrm_anon_uri"))
-            if(argv[i])
-                sandesha2_sender_bean_set_wsrm_anon_uri(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "to_address"))
-            if(argv[i])
-                sandesha2_sender_bean_set_to_address(bean, env, argv[i]);
+axis2_status_t 
+sandesha2_sender_retrieve_callback(
+    const axis2_env_t *env,
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    void *key,
+    axis2_array_list_t *data_list)
+{
+    int rc = -1;
+    sandesha2_sender_bean_t *bean = (sandesha2_sender_bean_t *) 
+        sandesha2_sender_bean_create(env);
+    axis2_char_t *msg_id = (axis2_char_t *) key;
+    if(msg_id)
+    {
+        if (sqlite3_bind_text(stmt, 1, msg_id, axis2_strlen(msg_id), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+    }
+    rc = sqlite3_step(stmt);
+    if(rc == SQLITE_BUSY)
+    {
+        if(busy_handler(stmt, rc) != SQLITE_OK)
+        {
+            return AXIS2_FAILURE;
+        }
+    }
+    while(rc == SQLITE_ROW)
+    {
+        sandesha2_sender_bean_set_msg_id(bean, env, 
+            (axis2_char_t *) sqlite3_column_text(stmt, 0));
+        sandesha2_sender_bean_set_msg_ctx_ref_key(bean, env,
+            (axis2_char_t *) sqlite3_column_text(stmt, 1));
+        sandesha2_sender_bean_set_internal_seq_id(bean, env,
+            (axis2_char_t *) sqlite3_column_text(stmt, 2));
+        sandesha2_sender_bean_set_sent_count(bean, env,
+            sqlite3_column_int(stmt, 3));
+        sandesha2_sender_bean_set_msg_no(bean, env,
+            sqlite3_column_int64(stmt, 4));
+        sandesha2_sender_bean_set_send(bean, env,
+            sqlite3_column_int(stmt, 5));
+        sandesha2_sender_bean_set_resend(bean, env,
+            sqlite3_column_int(stmt, 6));
+        sandesha2_sender_bean_set_time_to_send(bean, env,
+            sqlite3_column_int64(stmt, 7));
+        sandesha2_sender_bean_set_msg_type(bean, env,
+            sqlite3_column_int(stmt, 8));
+        sandesha2_sender_bean_set_seq_id(bean, env,
+            (axis2_char_t *) sqlite3_column_text(stmt, 9));
+        sandesha2_sender_bean_set_wsrm_anon_uri(bean, env,
+            (axis2_char_t *) sqlite3_column_text(stmt, 10));
+        sandesha2_sender_bean_set_to_address(bean, env,
+            (axis2_char_t *) sqlite3_column_text(stmt, 11));
+        rc = sqlite3_step(stmt);
+        if(rc == SQLITE_BUSY)
+        {
+            if(busy_handler(stmt, rc) != SQLITE_OK)
+            {
+                return AXIS2_FAILURE;
+            }
+        }
     }
     axis2_array_list_add(data_list, env, bean);
-    return 0;
+    return AXIS2_SUCCESS;
 }
 
-static int 
-sandesha2_sender_retrieve_callback(
-    void *not_used, 
-    int argc, 
-    char **argv, 
-    char **col_name)
+static axis2_status_t
+sandesha2_sender_remove_callback(
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    void *key)
 {
-    int i = 0;
-    sandesha2_bean_mgr_args_t *args = (sandesha2_bean_mgr_args_t *) not_used;
-    const axis2_env_t *env = args->env;
-    sandesha2_sender_bean_t *bean = (sandesha2_sender_bean_t *) args->data;
-    if(argc < 1)
+    int rc = -1;
+    axis2_char_t *msg_id = (axis2_char_t *) key;
+    if (sqlite3_bind_text(stmt, 1, msg_id, axis2_strlen(msg_id), SQLITE_STATIC))
     {
-        args->data = NULL;
-        return 0;
+        return AXIS2_FAILURE;
     }
-    if(!bean)
+    rc = sqlite3_step(stmt);
+    if (rc == SQLITE_BUSY)
     {
-        bean = sandesha2_sender_bean_create(env);
-        args->data = bean;
+        if(busy_handler(stmt, rc) != SQLITE_OK)
+        {
+            return AXIS2_FAILURE;
+        }
     }
-    for(i = 0; i < argc; i++)
+    else if (rc == SQLITE_DONE)
+        return AXIS2_SUCCESS;
+    return AXIS2_FAILURE;
+}
+
+static axis2_status_t 
+sandesha2_sender_update_or_insert_callback(
+    const axis2_env_t *env,
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    sandesha2_rm_bean_t *bean)
+{
+    if(!bean)
+        return AXIS2_FAILURE;
     {
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_id"))
-            sandesha2_sender_bean_set_msg_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_ctx_ref_key"))
-            if(argv[i])
-                sandesha2_sender_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "internal_seq_ID"))
-            if(argv[i])
-                sandesha2_sender_bean_set_internal_seq_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "sent_count"))
-            sandesha2_sender_bean_set_sent_count(bean, env, AXIS2_ATOI(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_no"))
-            sandesha2_sender_bean_set_msg_no(bean, env, atol(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "send"))
-            sandesha2_sender_bean_set_send(bean, env, AXIS2_ATOI(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "resend"))
-            sandesha2_sender_bean_set_resend(bean, env, AXIS2_ATOI(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "time_to_send"))
-            sandesha2_sender_bean_set_time_to_send(bean, env, atol(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "msg_type"))
-            sandesha2_sender_bean_set_msg_type(bean, env, AXIS2_ATOI(argv[i]));
-        if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
-            if(argv[i])
-                sandesha2_sender_bean_set_seq_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "wsrm_anon_uri"))
-            if(argv[i])
-                sandesha2_sender_bean_set_wsrm_anon_uri(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "to_address"))
-            if(argv[i])
-                sandesha2_sender_bean_set_to_address(bean, env, argv[i]);
+        int rc = -1;
+        axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) bean, 
+            env);
+        axis2_char_t *msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
+            (sandesha2_sender_bean_t *)bean, env);
+        axis2_char_t *internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(
+            (sandesha2_sender_bean_t *)bean, env);
+        int sent_count = sandesha2_sender_bean_get_sent_count(
+            (sandesha2_sender_bean_t *)bean, env);
+        long msg_no = sandesha2_sender_bean_get_msg_no(
+            (sandesha2_sender_bean_t *)bean, env);
+        axis2_bool_t send = sandesha2_sender_bean_is_send(
+            (sandesha2_sender_bean_t *)bean, env);
+        axis2_bool_t resend = sandesha2_sender_bean_is_resend(
+            (sandesha2_sender_bean_t *)bean, env);
+        long time_to_send = sandesha2_sender_bean_get_time_to_send(
+            (sandesha2_sender_bean_t *)bean, env);
+        int msg_type = sandesha2_sender_bean_get_msg_type(
+            (sandesha2_sender_bean_t *)bean, env);
+        axis2_char_t *seq_id = sandesha2_sender_bean_get_seq_id(
+            (sandesha2_sender_bean_t *)bean, env);
+        axis2_char_t *wsrm_anon_uri = sandesha2_sender_bean_get_wsrm_anon_uri(
+            (sandesha2_sender_bean_t *)bean, env);
+        axis2_char_t *to_address = sandesha2_sender_bean_get_to_address(
+            (sandesha2_sender_bean_t *)bean, env);
+        
+        if (sqlite3_bind_text(stmt, 1, msg_ctx_ref_key, axis2_strlen(msg_ctx_ref_key), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 2, internal_seq_id, axis2_strlen(internal_seq_id), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_int(stmt, 3, sent_count))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_int64(stmt, 4, msg_no))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_int(stmt, 5, send))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_int(stmt, 6, resend))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_int64(stmt, 7, time_to_send))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_int(stmt, 8, msg_type))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 9, seq_id, axis2_strlen(seq_id), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 10, wsrm_anon_uri, axis2_strlen(wsrm_anon_uri), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 11, to_address, axis2_strlen(to_address), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 12, msg_id, axis2_strlen(msg_id), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        rc = sqlite3_step(stmt);
+        if (rc == SQLITE_BUSY)
+        {
+            if(busy_handler(stmt, rc) != SQLITE_OK)
+            {
+                return AXIS2_FAILURE;
+            }
+        }
+        else if (rc == SQLITE_DONE)
+            return AXIS2_SUCCESS;
     }
-    return 0;
+    return AXIS2_FAILURE;
 }
 
 static int 
@@ -294,42 +369,6 @@
 
     axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) bean, 
         env);
-    axis2_char_t str_msg_id[msg_id?AXIS2_STRLEN(msg_id):8];
-    axis2_char_t *msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
-    axis2_char_t str_msg_ctx_ref_key[msg_ctx_ref_key?AXIS2_STRLEN(msg_ctx_ref_key):8];
-    axis2_char_t *internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(bean, env);
-    axis2_char_t str_internal_seq_id[internal_seq_id?AXIS2_STRLEN(internal_seq_id):8];
-    int sent_count = sandesha2_sender_bean_get_sent_count(bean, env);
-    axis2_char_t str_sent_count[32];
-    long msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
-    axis2_char_t str_msg_no[32];
-    axis2_bool_t send = sandesha2_sender_bean_is_send(bean, env);
-    axis2_char_t str_send[32];
-    axis2_bool_t resend = sandesha2_sender_bean_is_resend(bean, env);
-    axis2_char_t str_resend[32];
-    long time_to_send = sandesha2_sender_bean_get_time_to_send(bean, env);
-    axis2_char_t str_time_to_send[32];
-    int msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
-    axis2_char_t str_msg_type[32];
-    axis2_char_t *seq_id = sandesha2_sender_bean_get_seq_id(bean, env);
-    axis2_char_t str_seq_id[seq_id?AXIS2_STRLEN(seq_id):8];
-    axis2_char_t *wsrm_anon_uri = sandesha2_sender_bean_get_wsrm_anon_uri(bean, env);
-    axis2_char_t str_wsrm_anon_uri[wsrm_anon_uri?AXIS2_STRLEN(wsrm_anon_uri):8];
-    axis2_char_t *to_address = sandesha2_sender_bean_get_to_address(bean, env);
-    axis2_char_t str_to_address[to_address?AXIS2_STRLEN(to_address):8];
-
-    sprintf(str_msg_id, "'%s'", msg_id);
-    sprintf(str_msg_ctx_ref_key, msg_ctx_ref_key?"'%s'":"NULL", msg_ctx_ref_key);
-    sprintf(str_internal_seq_id, internal_seq_id?"'%s'":"NULL", internal_seq_id);
-    sprintf(str_sent_count, "%d", sent_count);
-    sprintf(str_msg_no, "%ld", msg_no);
-    sprintf(str_send, "%d", send);
-    sprintf(str_resend, "%d", resend);
-    sprintf(str_time_to_send, "%ld", time_to_send);
-    sprintf(str_msg_type, "%d", msg_type);
-    sprintf(str_seq_id, seq_id?"'%s'":"NULL", seq_id);
-    sprintf(str_wsrm_anon_uri, wsrm_anon_uri?"'%s'":"NULL", wsrm_anon_uri);
-    sprintf(str_to_address, to_address?"'%s'":"NULL", to_address);
 
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Entry:sandesha2_permanent_sender_mgr_insert");
@@ -337,27 +376,22 @@
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
 
-    sql_retrieve = axis2_strcat(env, "select msg_id, msg_ctx_ref_key, "\
+    sql_retrieve = "select msg_id, msg_ctx_ref_key, "\
         "internal_seq_id, sent_count, msg_no, send, resend, time_to_send, "\
         "msg_type, seq_id, wsrm_anon_uri, to_address from sender "\
-        "where msg_id=", str_msg_id, ";", NULL);
-    sql_update = axis2_strcat(env, "update sender set msg_ctx_ref_key=", 
-        str_msg_ctx_ref_key,",internal_seq_id=",str_internal_seq_id, 
-        ", sent_count=", str_sent_count, ", msg_no=", str_msg_no,
-        ", send=", str_send, ", resend=", str_resend, ", time_to_send=",
-        str_time_to_send, ", msg_type=", str_msg_type, ", seq_id=",
-        str_seq_id, ", wsrm_anon_uri=", str_wsrm_anon_uri,
-        ", to_address=", str_to_address,
-        "' where msg_id=", str_msg_id, ";", NULL);
-    sql_insert = axis2_strcat(env, "insert into sender(msg_id, msg_ctx_ref_key,"\
+        "where msg_id=?";
+    sql_update = "update sender set msg_ctx_ref_key=?,"\
+        "internal_seq_id=?, sent_count=?, msg_no=?, send=?, resend=?, "\
+        "time_to_send=?, msg_type=?, seq_id=?, wsrm_anon_uri=?,"\
+        "to_address=? where msg_id= ?";
+    sql_insert = "insert into sender(msg_ctx_ref_key,"\
         "internal_seq_id, sent_count, msg_no, send, resend, time_to_send,"\
-        "msg_type, seq_id, wsrm_anon_uri, to_address) values(", str_msg_id, ",",
-        str_msg_ctx_ref_key, ",", str_internal_seq_id, ",", str_sent_count, ",", 
-        str_msg_no, ",", str_send, ",", str_resend, ",", str_time_to_send, 
-        ",", str_msg_type, ",", str_seq_id, ",", str_wsrm_anon_uri, ",", 
-        str_to_address, ");", NULL);
+        "msg_type, seq_id, wsrm_anon_uri, to_address, msg_id) "\
+        "values(?,?,?,?,?,?,?,?,?,?,?,?)";
     ret = sandesha2_permanent_bean_mgr_insert(sender_mgr_impl->bean_mgr, env,
-        (sandesha2_rm_bean_t *) bean, sandesha2_sender_retrieve_callback, 
+        (void *) msg_id, (sandesha2_rm_bean_t *) bean, 
+        sandesha2_sender_retrieve_callback,
+        sandesha2_sender_update_or_insert_callback,
         sql_retrieve, sql_update, sql_insert);
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Exit:sandesha2_permanent_sender_mgr_insert:return:%d", ret);
@@ -376,14 +410,14 @@
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
     sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
-    sql_remove = axis2_strcat(env, "delete from sender where msg_id='",
-        msg_id, "';", NULL);
-    sql_retrieve = axis2_strcat(env, "select msg_id, msg_ctx_ref_key, "\
+    sql_remove = "delete from sender where msg_id=?";
+    sql_retrieve = "select msg_id, msg_ctx_ref_key, "\
         "internal_seq_id, sent_count, msg_no, send, resend, time_to_send, "\
         "msg_type, seq_id, wsrm_anon_uri, to_address from sender "\
-        "where msg_id='", msg_id, "';", NULL);
+        "where msg_id=?";
     return sandesha2_permanent_bean_mgr_remove(sender_mgr_impl->bean_mgr, env,
-        sandesha2_sender_retrieve_callback, sql_retrieve, sql_remove);
+        (void *) msg_id, sandesha2_sender_retrieve_callback, 
+        sandesha2_sender_remove_callback, sql_retrieve, sql_remove);
 }
 
 sandesha2_sender_bean_t *AXIS2_CALL
@@ -401,13 +435,13 @@
         "[sandesha2]Entry:sandesha2_permanent_sender_mgr_retrieve");
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
-    sql_retrieve = axis2_strcat(env, "select msg_id, msg_ctx_ref_key, "\
+    sql_retrieve = "select msg_id, msg_ctx_ref_key, "\
         "internal_seq_id, sent_count, msg_no, send, resend, time_to_send, "\
         "msg_type, seq_id, wsrm_anon_uri, to_address from sender "\
-        "where msg_id='", msg_id, "';", NULL);
+        "where msg_id=?";
     ret = (sandesha2_sender_bean_t *) sandesha2_permanent_bean_mgr_retrieve(
-        sender_mgr_impl->bean_mgr, env, sandesha2_sender_retrieve_callback, 
-        sql_retrieve);
+        sender_mgr_impl->bean_mgr, env, (void *) msg_id, 
+        sandesha2_sender_retrieve_callback, sql_retrieve);
 
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Exit:sandesha2_permanent_sender_mgr_retrieve");
@@ -427,64 +461,26 @@
 
     axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) bean, 
         env);
-    axis2_char_t str_msg_id[msg_id?AXIS2_STRLEN(msg_id):8];
-    axis2_char_t *msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
-    axis2_char_t str_msg_ctx_ref_key[msg_ctx_ref_key?AXIS2_STRLEN(msg_ctx_ref_key):8];
-    axis2_char_t *internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(bean, env);
-    axis2_char_t str_internal_seq_id[internal_seq_id?AXIS2_STRLEN(internal_seq_id):8];
-    int sent_count = sandesha2_sender_bean_get_sent_count(bean, env);
-    axis2_char_t str_sent_count[32];
-    long msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
-    axis2_char_t str_msg_no[32];
-    axis2_bool_t send = sandesha2_sender_bean_is_send(bean, env);
-    axis2_char_t str_send[32];
-    axis2_bool_t resend = sandesha2_sender_bean_is_resend(bean, env);
-    axis2_char_t str_resend[32];
-    long time_to_send = sandesha2_sender_bean_get_time_to_send(bean, env);
-    axis2_char_t str_time_to_send[32];
-    int msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
-    axis2_char_t str_msg_type[32];
-    axis2_char_t *seq_id = sandesha2_sender_bean_get_seq_id(bean, env);
-    axis2_char_t str_seq_id[seq_id?AXIS2_STRLEN(seq_id):8];
-    axis2_char_t *wsrm_anon_uri = sandesha2_sender_bean_get_wsrm_anon_uri(bean, env);
-    axis2_char_t str_wsrm_anon_uri[wsrm_anon_uri?AXIS2_STRLEN(wsrm_anon_uri):8];
-    axis2_char_t *to_address = sandesha2_sender_bean_get_to_address(bean, env);
-    axis2_char_t str_to_address[to_address?AXIS2_STRLEN(to_address):8];
-
-    sprintf(str_msg_id, "'%s'", msg_id);
-    sprintf(str_msg_ctx_ref_key, msg_ctx_ref_key?"'%s'":"NULL", msg_ctx_ref_key);
-    sprintf(str_internal_seq_id, internal_seq_id?"'%s'":"NULL", internal_seq_id);
-    sprintf(str_sent_count, "%d", sent_count);
-    sprintf(str_msg_no, "%ld", msg_no);
-    sprintf(str_send, "%d", send);
-    sprintf(str_resend, "%d", resend);
-    sprintf(str_time_to_send, "%ld", time_to_send);
-    sprintf(str_msg_type, "%d", msg_type);
-    sprintf(str_seq_id, seq_id?"'%s'":"NULL", seq_id);
-    sprintf(str_wsrm_anon_uri, wsrm_anon_uri?"'%s'":"NULL", wsrm_anon_uri);
-    sprintf(str_to_address, to_address?"'%s'":"NULL", to_address);
-
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Entry:sandesha2_permanent_sender_mgr_update");
 
-    sql_retrieve = axis2_strcat(env, "select msg_id, msg_ctx_ref_key, "\
+    sql_retrieve = "select msg_id, msg_ctx_ref_key, "\
         "internal_seq_id, sent_count, msg_no, send, resend, time_to_send, "\
         "msg_type, seq_id, wsrm_anon_uri, to_address from sender "\
-        "where msg_id=", str_msg_id, ";", NULL);
+        "where msg_id=?";
 
-    sql_update = axis2_strcat(env, "update sender set msg_ctx_ref_key=", 
-        str_msg_ctx_ref_key,",internal_seq_id=",str_internal_seq_id, 
-        ", sent_count=", str_sent_count, ", msg_no=", str_msg_no,
-        ", send=", str_send, ", resend=", str_resend, ", time_to_send=",
-        str_time_to_send, ", msg_type=", str_msg_type, ", seq_id=",
-        str_seq_id, ", wsrm_anon_uri=", str_wsrm_anon_uri,
-        ", to_address=", str_to_address, " where msg_id=", str_msg_id, 
-        ";", NULL);
+    sql_update = "update sender set msg_ctx_ref_key=?,"\
+        "internal_seq_id=?, sent_count=?, msg_no=?, send=?, resend=?,"\
+        "time_to_send=?, msg_type=?, seq_id=?, wsrm_anon_uri=?, to_address=?"\
+        " where msg_id=?";
     ret = sandesha2_permanent_bean_mgr_update(sender_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *) bean, sandesha2_sender_retrieve_callback, sql_retrieve, sql_update);
+        (void *) msg_id, (sandesha2_rm_bean_t *) bean, 
+        sandesha2_sender_retrieve_callback, 
+        sandesha2_sender_update_or_insert_callback, 
+        sql_retrieve, sql_update);
 
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Exit:sandesha2_permanent_invoker_mgr_update:return:%d", ret);
@@ -512,12 +508,12 @@
     bean = sandesha2_sender_bean_create(env);
     sandesha2_sender_bean_set_internal_seq_id(bean, env, 
         internal_seq_id);
-    sql_find = axis2_strcat(env, "select msg_id, msg_ctx_ref_key, internal_seq_id, "\
+    sql_find = "select msg_id, msg_ctx_ref_key, internal_seq_id, "\
         "sent_count, msg_no, send, resend, time_to_send, msg_type, seq_id, "\
-        "wsrm_anon_uri, to_address from sender;", NULL);
+        "wsrm_anon_uri, to_address from sender;";
     sql_count = "select count(*) as no_recs from sender;";
     ret = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *) bean, sandesha2_sender_find_callback,
+        (sandesha2_rm_bean_t *) bean, sandesha2_sender_retrieve_callback,
         sandesha2_sender_count_callback, sql_find, sql_count);
     if(bean)
         sandesha2_sender_bean_free((sandesha2_rm_bean_t *) bean, env);
@@ -540,12 +536,12 @@
         "[sandesha2]Entry:sandesha2_permanent_sender_mgr_find_by_sender_bean");
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
-    sql_find = axis2_strcat(env, "select msg_id, msg_ctx_ref_key, internal_seq_id,"\
+    sql_find = "select msg_id, msg_ctx_ref_key, internal_seq_id,"\
         "sent_count, msg_no, send, resend, time_to_send, msg_type, seq_id, "\
-        "wsrm_anon_uri, to_address from sender;", NULL);
+        "wsrm_anon_uri, to_address from sender;";
     sql_count = "select count(*) as no_recs from sender;";
     ret = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *) bean, sandesha2_sender_find_callback,
+        (sandesha2_rm_bean_t *) bean, sandesha2_sender_retrieve_callback,
         sandesha2_sender_count_callback, sql_find, sql_count);
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Exit:sandesha2_permanent_sender_mgr_find_by_sender_bean");
@@ -564,13 +560,13 @@
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
-    sql_find = axis2_strcat(env, "select msg_ctx_ref_key, internal_seq_id, "\
+    sql_find = "select msg_ctx_ref_key, internal_seq_id, "\
         "sent_count, msg_no, send, resend, time_to_send, msg_type, seq_id, "\
-        "wsrm_anon_uri, to_address from sender;", NULL);
+        "wsrm_anon_uri, to_address from sender;";
     sql_count = "select count(*) as no_recs from sender;";
     return (sandesha2_sender_bean_t *) sandesha2_permanent_bean_mgr_find(
         sender_mgr_impl->bean_mgr, env, (sandesha2_rm_bean_t *) bean, 
-        sandesha2_sender_find_callback, sandesha2_sender_count_callback, 
+        sandesha2_sender_retrieve_callback, sandesha2_sender_count_callback, 
         sql_find, sql_count);
 }
 
@@ -699,7 +695,7 @@
         "to_address from sender;", NULL);
     sql_count = "select count(*) as no_recs from sender;";
     match_list = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *) matcher, sandesha2_sender_find_callback,
+        (sandesha2_rm_bean_t *) matcher, sandesha2_sender_retrieve_callback,
         sandesha2_sender_count_callback, sql_find, sql_count);
 
     /*

Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c?view=diff&rev=492446&r1=492445&r2=492446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c Thu Jan  4 00:30:15 2007
@@ -43,78 +43,133 @@
 #define SANDESHA2_INTF_TO_IMPL(seq_property_mgr) \
     ((sandesha2_permanent_seq_property_mgr_t *) seq_property_mgr)
 
-static int 
-sandesha2_seq_property_find_callback(
-    void *not_used, 
-    int argc, 
-    char **argv, 
-    char **col_name)
-{
-    int i = 0;
-    sandesha2_seq_property_bean_t *bean = NULL; 
-    sandesha2_bean_mgr_args_t *args = (sandesha2_bean_mgr_args_t *) not_used;
-    const axis2_env_t *env = args->env;
-    axis2_array_list_t *data_list = (axis2_array_list_t *) args->data;
-    if(argc < 1)
+static axis2_char_t *
+sandesha2_permanent_seq_property_mgr_get_id_with_bean(
+    const axis2_env_t *env,
+    sandesha2_seq_property_bean_t *bean);
+
+axis2_status_t 
+sandesha2_seq_property_retrieve_callback(
+    const axis2_env_t *env,
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    void *key,
+    axis2_array_list_t *data_list)
+{
+    int rc = -1;
+    sandesha2_seq_property_bean_t *bean = (sandesha2_seq_property_bean_t *) 
+        sandesha2_seq_property_bean_create(env);
+    axis2_char_t *id = (axis2_char_t *) key;
+    if(id)
     {
-        args->data = NULL;
-        return 0;
+        if (sqlite3_bind_text(stmt, 1, id, 
+            axis2_strlen(id), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
     }
-    if(!data_list)
+    rc = sqlite3_step(stmt);
+    if(rc == SQLITE_BUSY)
     {
-        data_list = axis2_array_list_create(env, 0);
-        args->data = data_list;
+        if(busy_handler(stmt, rc) != SQLITE_OK)
+        {
+            return AXIS2_FAILURE;
+        }
     }
-    bean = sandesha2_seq_property_bean_create(env);
-    for(i = 0; i < argc; i++)
+    while(rc == SQLITE_ROW)
     {
-        if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
-            sandesha2_seq_property_bean_set_seq_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "name"))
-            if(argv[i])
-                sandesha2_seq_property_bean_set_name(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "value"))
-            if(argv[i])
-                sandesha2_seq_property_bean_set_value(bean, env, argv[i]);
+        sandesha2_seq_property_bean_set_seq_id(bean, env, 
+            (axis2_char_t *) sqlite3_column_text(stmt, 0));
+        sandesha2_seq_property_bean_set_name(bean, env,
+            (axis2_char_t *) sqlite3_column_text(stmt, 1));
+        sandesha2_seq_property_bean_set_value(bean, env,
+            (axis2_char_t *) sqlite3_column_text(stmt, 2));
+        rc = sqlite3_step(stmt);
+        if(rc == SQLITE_BUSY)
+        {
+            if(busy_handler(stmt, rc) != SQLITE_OK)
+            {
+                return AXIS2_FAILURE;
+            }
+        }
     }
     axis2_array_list_add(data_list, env, bean);
-    return 0;
+    return AXIS2_SUCCESS;
 }
 
-static int 
-sandesha2_seq_property_retrieve_callback(
-    void *not_used, 
-    int argc, 
-    char **argv, 
-    char **col_name)
-{
-    int i = 0;
-    sandesha2_bean_mgr_args_t *args = (sandesha2_bean_mgr_args_t *) not_used;
-    const axis2_env_t *env = args->env;
-    sandesha2_seq_property_bean_t *bean = NULL;
-    if(argc < 1)
+static axis2_status_t
+sandesha2_seq_property_remove_callback(
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    void *key)
+{
+    int rc = -1;
+    axis2_char_t *id = (axis2_char_t *) key;
+    if (sqlite3_bind_text(stmt, 1, id, 
+        axis2_strlen(id), SQLITE_STATIC))
     {
-        args->data = NULL;
-        return 0;
+        return AXIS2_FAILURE;
     }
-    bean = (sandesha2_seq_property_bean_t *) args->data;
-    if(!bean)
+    rc = sqlite3_step(stmt);
+    if (rc == SQLITE_BUSY)
     {
-        bean = sandesha2_seq_property_bean_create(env);
-        args->data = bean;
+        if(busy_handler(stmt, rc) != SQLITE_OK)
+        {
+            return AXIS2_FAILURE;
+        }
     }
-    for(i = 0; i < argc; i++)
+    else if (rc == SQLITE_DONE)
+        return AXIS2_SUCCESS;
+    return AXIS2_FAILURE;
+}
+
+static axis2_status_t 
+sandesha2_seq_property_update_or_insert_callback(
+    const axis2_env_t *env,
+    sqlite3_stmt *stmt,
+    int (*busy_handler)(sqlite3_stmt* stmt, int rc),
+    sandesha2_rm_bean_t *seq_prop_bean)
+{
+    sandesha2_seq_property_bean_t *bean = (sandesha2_seq_property_bean_t *) 
+        seq_prop_bean;
+    if(!bean)
+        return AXIS2_FAILURE;
     {
-        if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
-            sandesha2_seq_property_bean_set_seq_id(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "name"))
-            if(argv[i])
-                sandesha2_seq_property_bean_set_name(bean, env, argv[i]);
-        if(0 == AXIS2_STRCMP(col_name[i], "value"))
-            if(argv[i])
-                sandesha2_seq_property_bean_set_value(bean, env, argv[i]);
+        int rc = -1;
+        axis2_char_t *id = sandesha2_permanent_seq_property_mgr_get_id_with_bean(env, bean);
+        axis2_char_t *seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
+        axis2_char_t *name = sandesha2_seq_property_bean_get_name(bean, env);
+        axis2_char_t *value = sandesha2_seq_property_bean_get_value(bean, env);
+          
+        if (sqlite3_bind_text(stmt, 1, seq_id, axis2_strlen(
+            seq_id), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 2, name, axis2_strlen(name), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 3, value, axis2_strlen(value), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        if (sqlite3_bind_text(stmt, 4, id, axis2_strlen(id), SQLITE_STATIC))
+        {
+            return AXIS2_FAILURE;
+        }
+        rc = sqlite3_step(stmt);
+        if (rc == SQLITE_BUSY)
+        {
+            if(busy_handler(stmt, rc) != SQLITE_OK)
+            {
+                return AXIS2_FAILURE;
+            }
+        }
+        else if (rc == SQLITE_DONE)
+            return AXIS2_SUCCESS;
     }
-    return 0;
+    return AXIS2_FAILURE;
 }
 
 static int 
@@ -186,11 +241,6 @@
     const axis2_env_t *env);
 
 static axis2_char_t *
-sandesha2_permanent_seq_property_mgr_get_id_with_bean(
-    const axis2_env_t *env,
-    sandesha2_seq_property_bean_t *bean);
-
-static axis2_char_t *
 sandesha2_permanent_seq_property_mgr_get_id_with_seq_id_and_name(
     const axis2_env_t *env,
     axis2_char_t *seq_id,
@@ -262,38 +312,24 @@
     axis2_char_t *sql_update = NULL;
     axis2_char_t *sql_retrieve = NULL;
     axis2_bool_t ret = AXIS2_FALSE;
+    axis2_char_t *id = NULL; 
     sandesha2_permanent_seq_property_mgr_t *seq_prop_mgr_impl = NULL;
 
-    axis2_char_t *id = sandesha2_permanent_seq_property_mgr_get_id_with_bean(env, bean);
-    axis2_char_t str_id[AXIS2_STRLEN(id)];
-    axis2_char_t *seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
-    axis2_char_t str_seq_id[seq_id?AXIS2_STRLEN(seq_id):8];
-    axis2_char_t *name = sandesha2_seq_property_bean_get_name(bean, env);
-    axis2_char_t str_name[name?AXIS2_STRLEN(name):8];
-    axis2_char_t *value = sandesha2_seq_property_bean_get_value(bean, env);
-    axis2_char_t str_value[value?AXIS2_STRLEN(value):8];
-
-    sprintf(str_id, "'%s'", id);
-    sprintf(str_seq_id, seq_id?"'%s'":"NULL", seq_id);
-    sprintf(str_name, name?"'%s'":"NULL", name);
-    sprintf(str_value, value?"'%s'":"NULL", value);
-
     AXIS2_LOG_INFO(env->log, 
         "Entry:[sandesha2]sandesha2_permanent_seq_property_mgr_insert");
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
 
-    sql_retrieve = axis2_strcat(env, "select seq_id, name, value from seq_property "\
-        "where id=", str_id, ";", NULL);
-    sql_update = axis2_strcat(env, "update seq_property set seq_id=", 
-        str_seq_id, ", name=", str_name, ", value=", str_value, 
-        " where id=", str_id, ";", NULL);
-    sql_insert = axis2_strcat(env, "insert into seq_property(id, seq_id, "\
-        "name, value) values(", str_id, ",", str_seq_id, ",", str_name, 
-        ",", str_value, ");", NULL);
+    id = sandesha2_permanent_seq_property_mgr_get_id_with_bean(env, bean);
+    sql_retrieve = "select seq_id, name, value from seq_property "\
+        "where id=?";
+    sql_update = "update seq_property set seq_id=?, name=?, value=? where id=?";
+    sql_insert = "insert into seq_property(seq_id, name, value, id) values(?,?,?,?)";
     ret = sandesha2_permanent_bean_mgr_insert(seq_prop_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *) bean,  sandesha2_seq_property_retrieve_callback, 
+        (void *) id, (sandesha2_rm_bean_t *) bean,  
+        sandesha2_seq_property_retrieve_callback, 
+        sandesha2_seq_property_update_or_insert_callback, 
         sql_retrieve, sql_update, sql_insert);
     AXIS2_LOG_INFO(env->log, 
         "Exit:[sandesha2]sandesha2_permanent_seq_property_mgr_insert:return%d", 
@@ -320,12 +356,13 @@
     seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
     key = sandesha2_permanent_seq_property_mgr_get_id_with_seq_id_and_name(env, 
         seq_id, name);
-    sql_remove = axis2_strcat(env, "delete from seq_property where id='",
-        key, "';", NULL);
-    sql_retrieve = axis2_strcat(env, "select seq_id, name, value from seq_property "\
-        "where id='", key, "';", NULL);
-    status = sandesha2_permanent_bean_mgr_remove(seq_prop_mgr_impl->bean_mgr, env, 
-        sandesha2_seq_property_retrieve_callback, sql_retrieve, sql_remove);
+    sql_remove = "delete from seq_property where id=?";
+    sql_retrieve = "select seq_id, name, value from seq_property "\
+        "where id=?";
+    status = sandesha2_permanent_bean_mgr_remove(seq_prop_mgr_impl->bean_mgr, 
+        env, (void *) key, sandesha2_seq_property_retrieve_callback, 
+        sandesha2_seq_property_remove_callback, 
+        sql_retrieve, sql_remove);
     AXIS2_FREE(env->allocator, key);
     return status;
 }
@@ -350,11 +387,11 @@
     seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
     key = sandesha2_permanent_seq_property_mgr_get_id_with_seq_id_and_name(env, 
         seq_id, name);
-    sql_retrieve = axis2_strcat(env, "select seq_id, name, value from seq_property "\
-        "where id='", key, "';", NULL);
+    sql_retrieve = "select seq_id, name, value from seq_property "\
+        "where id=?";
     ret = (sandesha2_seq_property_bean_t *) sandesha2_permanent_bean_mgr_retrieve(
-        seq_prop_mgr_impl->bean_mgr, env, sandesha2_seq_property_retrieve_callback, 
-        sql_retrieve);
+        seq_prop_mgr_impl->bean_mgr, env, (void *) key, 
+        sandesha2_seq_property_retrieve_callback, sql_retrieve);
     AXIS2_FREE(env->allocator, key);
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Exit:sandesha2_permanent_seq_property_mgr_retrieve");
@@ -373,18 +410,6 @@
     sandesha2_permanent_seq_property_mgr_t *seq_prop_mgr_impl = NULL;
 
     axis2_char_t *id = sandesha2_permanent_seq_property_mgr_get_id_with_bean(env, bean);
-    axis2_char_t str_id[AXIS2_STRLEN(id)];
-    axis2_char_t *seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
-    axis2_char_t str_seq_id[seq_id?AXIS2_STRLEN(seq_id):8];
-    axis2_char_t *name = sandesha2_seq_property_bean_get_name(bean, env);
-    axis2_char_t str_name[name?AXIS2_STRLEN(name):8];
-    axis2_char_t *value = sandesha2_seq_property_bean_get_value(bean, env);
-    axis2_char_t str_value[value?AXIS2_STRLEN(value):8];
-
-    sprintf(str_id, "'%s'", id);
-    sprintf(str_seq_id, seq_id?"'%s'":"NULL", seq_id);
-    sprintf(str_name, name?"'%s'":"NULL", name);
-    sprintf(str_value, value?"'%s'":"NULL", value);
 
     AXIS2_LOG_INFO(env->log, 
         "Entry:[sandesha2]sandesha2_permanent_seq_property_mgr_update");
@@ -392,13 +417,12 @@
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
 
-    sql_retrieve = axis2_strcat(env, "select seq_id, name, value from "\
-        "seq_property where id=", str_id, ";", NULL);
-    sql_update = axis2_strcat(env, "update seq_property set seq_id=", 
-        str_seq_id, ", name=", str_name, ", value=", str_value, 
-        " where id=", str_id, ";", NULL);
+    sql_retrieve = "select seq_id, name, value from seq_property where id=?";
+    sql_update = "update seq_property set seq_id=?,name=?,value=? where id=?";
     ret = sandesha2_permanent_bean_mgr_update(seq_prop_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *) bean, sandesha2_seq_property_retrieve_callback, 
+        (void *)id, (sandesha2_rm_bean_t *) bean, 
+        sandesha2_seq_property_retrieve_callback, 
+        sandesha2_seq_property_update_or_insert_callback, 
         sql_retrieve, sql_update);
     AXIS2_LOG_INFO(env->log, 
         "Exit:[sandesha2]sandesha2_permanent_seq_property_mgr_update:return:%d", ret);
@@ -419,11 +443,10 @@
         "[sandesha2]Entry:sandesha2_permanent_seq_property_mgr_find");
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
-    sql_find = axis2_strcat(env, "select seq_id, name,value from seq_property;", 
-        NULL);
+    sql_find = "select seq_id, name,value from seq_property;";
     sql_count = "select count(*) as no_recs from seq_property;";
     ret = sandesha2_permanent_bean_mgr_find(seq_prop_mgr_impl->bean_mgr, env, 
-        (sandesha2_rm_bean_t *) bean, sandesha2_seq_property_find_callback,
+        (sandesha2_rm_bean_t *) bean, sandesha2_seq_property_retrieve_callback,
         sandesha2_seq_property_count_callback, sql_find, sql_count);
     AXIS2_LOG_INFO(env->log, 
         "[sandesha2]Exit:sandesha2_permanent_seq_property_mgr_find");
@@ -442,12 +465,11 @@
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
     seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
-    sql_find = axis2_strcat(env, "select seq_id, name,value from seq_property;", 
-        NULL);
+    sql_find = "select seq_id, name,value from seq_property;";
     sql_count = "select count(*) as no_recs from seq_property;";
     return (sandesha2_seq_property_bean_t *) 
         sandesha2_permanent_bean_mgr_find_unique(seq_prop_mgr_impl->bean_mgr, 
-        env, (sandesha2_rm_bean_t *) bean, sandesha2_seq_property_find_callback,
+        env, (sandesha2_rm_bean_t *) bean, sandesha2_seq_property_retrieve_callback,
         sandesha2_seq_property_count_callback, sql_find, sql_count);
 }
 

Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=492446&r1=492445&r2=492446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Thu Jan  4 00:30:15 2007
@@ -1139,3 +1139,17 @@
     return map;
 }
 
+sqlite3 * AXIS2_CALL
+sandesha2_permanent_storage_mgr_get_dbconn(
+    sandesha2_storage_mgr_t *storage_mgr, 
+    const axis2_env_t *env)
+{
+    sqlite3* dbconn = NULL;
+    sandesha2_transaction_t *transaction = NULL;
+    transaction = sandesha2_permanent_storage_mgr_get_transaction(storage_mgr, 
+        env);
+    if(transaction)
+        dbconn = (sqlite3 *) sandesha2_permanent_transaction_get_dbconn(transaction, env);
+    return dbconn;
+}
+

Modified: webservices/sandesha/trunk/c/src/storage/permanent/sandesha2_permanent_bean_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/sandesha2_permanent_bean_mgr.h?view=diff&rev=492446&r1=492445&r2=492446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/sandesha2_permanent_bean_mgr.h (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/sandesha2_permanent_bean_mgr.h Thu Jan  4 00:30:15 2007
@@ -30,6 +30,7 @@
 #include <axis2_array_list.h>
 #include <sandesha2_rm_bean.h>
 #include <sandesha2_msg_store_bean.h>
+#include <sqlite3.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -79,8 +80,12 @@
 sandesha2_permanent_bean_mgr_insert(
     sandesha2_permanent_bean_mgr_t *bean_mgr,
     const axis2_env_t *env,
+    void *key,
     sandesha2_rm_bean_t *bean,
-    int (*retrieve_func)(void *, int, char **, char **),
+    axis2_status_t (*retrieve_callback)(const axis2_env_t *, sqlite3_stmt *, int (*busy_handler)(
+        sqlite3_stmt*, int), void *, axis2_array_list_t *),
+    axis2_status_t (*update_or_insert_callback)(const axis2_env_t *, sqlite3_stmt *, int (*busy_handler)(
+        sqlite3_stmt*, int), sandesha2_rm_bean_t *),
     axis2_char_t *sql_stmt_retrieve,
     axis2_char_t *sql_stmt_update,
     axis2_char_t *sql_stmt_insert);
@@ -89,7 +94,11 @@
 sandesha2_permanent_bean_mgr_remove(
     sandesha2_permanent_bean_mgr_t *bean_mgr,
     const axis2_env_t *env,
-    int (*retrieve_func)(void *, int, char **, char **),
+    void *key, 
+    axis2_status_t (*retrieve_callback)(const axis2_env_t *, sqlite3_stmt *, int (*busy_handler)(
+        sqlite3_stmt*, int), void *, axis2_array_list_t *),
+    axis2_status_t (*remove_callback)(sqlite3_stmt *, int (*busy_handler)(
+        sqlite3_stmt*, int), void *),
     axis2_char_t *sql_stmt_retrieve,
     axis2_char_t *sql_stmt_remove);
 
@@ -97,15 +106,21 @@
 sandesha2_permanent_bean_mgr_retrieve(
     sandesha2_permanent_bean_mgr_t *bean_mgr,
     const axis2_env_t *env,
-    int (*retrieve_func)(void *, int, char **, char **),
+    void *key,
+    axis2_status_t (*retrieve_callback)(const axis2_env_t *, sqlite3_stmt *, int (*busy_handler)(
+        sqlite3_stmt*, int), void *, axis2_array_list_t *),
     axis2_char_t *sql_stmt_retrieve);
 
 axis2_bool_t AXIS2_CALL
 sandesha2_permanent_bean_mgr_update(
     sandesha2_permanent_bean_mgr_t *bean_mgr,
     const axis2_env_t *env,
+    void *key,
     sandesha2_rm_bean_t *bean,
-    int (*update_func)(void *, int, char **, char **),
+    axis2_status_t (*retrieve_callback)(const axis2_env_t *, sqlite3_stmt *, int (*busy_handler)(
+        sqlite3_stmt*, int), void *, axis2_array_list_t *),
+    axis2_status_t (*update_or_insert_callback)(const axis2_env_t *, sqlite3_stmt *, int (*busy_handler)(
+        sqlite3_stmt*, int), sandesha2_rm_bean_t *),
     axis2_char_t *sql_stmt_retrieve_old_bean,
     axis2_char_t *sql_stmt_update);
 
@@ -114,7 +129,8 @@
     sandesha2_permanent_bean_mgr_t *bean_mgr,
     const axis2_env_t *env,
     sandesha2_rm_bean_t *bean,
-    int (*find_func)(void *, int, char **, char **),
+    axis2_status_t (*retrieve_callback)(const axis2_env_t *env, sqlite3_stmt *, int (*busy_handler)(
+        sqlite3_stmt*, int), void *, axis2_array_list_t *),
     int (*count_func)(void *, int, char **, char **),
     axis2_char_t *sql_stmt_find,
     axis2_char_t *sql_stmt_count);
@@ -124,7 +140,8 @@
     sandesha2_permanent_bean_mgr_t *bean_mgr,
     const axis2_env_t *env,
     sandesha2_rm_bean_t *bean,
-    int (*find_func)(void *, int, char **, char **),
+    axis2_status_t (*retrieve_callback)(const axis2_env_t *, sqlite3_stmt *, int (*busy_handler)(
+        sqlite3_stmt*, int), void *, axis2_array_list_t *),
     int (*count_func)(void *, int, char **, char **),
     axis2_char_t *sql_stmt_find,
     axis2_char_t *sql_stmt_count);



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org