Remove cts_ prefix : cts_ -> ctsvc_ 28/13828/2
authorDonghee Ye <donghee.ye@samsung.com>
Tue, 17 Dec 2013 05:35:45 +0000 (14:35 +0900)
committerDonghee Ye <donghee.ye@samsung.com>
Tue, 17 Dec 2013 06:18:48 +0000 (15:18 +0900)
Change internal function cts_query_prepare

Change-Id: I1aad8c391407c70a8b6ffd0bffec0cc247f77dd3

52 files changed:
common/ctsvc_mutex.c
common/ctsvc_socket.c
common/ctsvc_view.h
native/ctsvc_db_plugin_activity.c
native/ctsvc_db_plugin_address.c
native/ctsvc_db_plugin_address_helper.c
native/ctsvc_db_plugin_addressbook.c
native/ctsvc_db_plugin_addressbook_helper.c
native/ctsvc_db_plugin_company.c
native/ctsvc_db_plugin_company_helper.c
native/ctsvc_db_plugin_contact.c
native/ctsvc_db_plugin_contact_helper.c
native/ctsvc_db_plugin_email.c
native/ctsvc_db_plugin_email_helper.c
native/ctsvc_db_plugin_event.c
native/ctsvc_db_plugin_event_helper.c
native/ctsvc_db_plugin_extension.c
native/ctsvc_db_plugin_extension_helper.c
native/ctsvc_db_plugin_group.c
native/ctsvc_db_plugin_grouprelation.c
native/ctsvc_db_plugin_image.c
native/ctsvc_db_plugin_image_helper.c
native/ctsvc_db_plugin_messenger.c
native/ctsvc_db_plugin_messenger_helper.c
native/ctsvc_db_plugin_my_profile.c
native/ctsvc_db_plugin_name.c
native/ctsvc_db_plugin_name_helper.c
native/ctsvc_db_plugin_nickname.c
native/ctsvc_db_plugin_nickname_helper.c
native/ctsvc_db_plugin_note.c
native/ctsvc_db_plugin_note_helper.c
native/ctsvc_db_plugin_number.c
native/ctsvc_db_plugin_number_helper.c
native/ctsvc_db_plugin_person.c
native/ctsvc_db_plugin_person_helper.c
native/ctsvc_db_plugin_phonelog.c
native/ctsvc_db_plugin_profile.c
native/ctsvc_db_plugin_profile_helper.c
native/ctsvc_db_plugin_relationship.c
native/ctsvc_db_plugin_relationship_helper.c
native/ctsvc_db_plugin_sdn.c
native/ctsvc_db_plugin_simple_contact.c
native/ctsvc_db_plugin_speeddial.c
native/ctsvc_db_plugin_url.c
native/ctsvc_db_plugin_url_helper.c
native/ctsvc_db_query.c
native/ctsvc_group.c
native/ctsvc_number_utils.h
native/ctsvc_person.c
native/ctsvc_sqlite.c
native/ctsvc_sqlite.h
server/ctsvc_server_bg.c

index 9209f61..cf9f3de 100755 (executable)
@@ -27,9 +27,9 @@
 typedef struct {
        int (* lock) (pthread_mutex_t *mutex);
        int (* unlock) (pthread_mutex_t *mutex);
-}cts_mutex_fns;
+}ctsvc_mutex_fns;
 
-static cts_mutex_fns cts_mutex_funtions =
+static ctsvc_mutex_fns __ctsvc_mutex_funtions =
 {
        pthread_mutex_lock,
        pthread_mutex_unlock
@@ -42,7 +42,7 @@ static pthread_mutex_t ipc_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t ipc_pubsub_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t access_control_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static inline pthread_mutex_t* cts_mutex_get_mutex(int type)
+static inline pthread_mutex_t* __ctsvc_mutex_get_mutex(int type)
 {
        pthread_mutex_t *ret_val;
 
@@ -78,10 +78,10 @@ void ctsvc_mutex_lock(int type)
        int ret;
        pthread_mutex_t *mutex;
 
-       mutex = cts_mutex_get_mutex(type);
+       mutex = __ctsvc_mutex_get_mutex(type);
 
-       if (cts_mutex_funtions.lock) {
-               ret = cts_mutex_funtions.lock(mutex);
+       if (__ctsvc_mutex_funtions.lock) {
+               ret = __ctsvc_mutex_funtions.lock(mutex);
                WARN_IF(ret, "mutex_lock Failed(%d)", ret);
        }
 }
@@ -91,10 +91,10 @@ void ctsvc_mutex_unlock(int type)
        int ret;
        pthread_mutex_t *mutex;
 
-       mutex = cts_mutex_get_mutex(type);
+       mutex = __ctsvc_mutex_get_mutex(type);
 
-       if (cts_mutex_funtions.unlock) {
-               ret = cts_mutex_funtions.unlock(mutex);
+       if (__ctsvc_mutex_funtions.unlock) {
+               ret = __ctsvc_mutex_funtions.unlock(mutex);
                WARN_IF(ret, "mutex_unlock Failed(%d)", ret);
        }
 }
index 2fd1255..21682a6 100644 (file)
 #include "ctsvc_mutex.h"
 #include "ctsvc_inotify.h"
 
-static int ctsvc_conn_refcnt = 0;
-static int cts_sockfd = -1;
+static int __ctsvc_conn_refcnt = 0;
+static int __ctsvc_sockfd = -1;
 
 int ctsvc_socket_init(void)
 {
        int ret;
        struct sockaddr_un caddr;
 
-       if (0 < ctsvc_conn_refcnt) {
-               ctsvc_conn_refcnt++;
+       if (0 < __ctsvc_conn_refcnt) {
+               __ctsvc_conn_refcnt++;
                return  CONTACTS_ERROR_NONE;
        }
 
@@ -45,37 +45,37 @@ int ctsvc_socket_init(void)
        caddr.sun_family = AF_UNIX;
        snprintf(caddr.sun_path, sizeof(caddr.sun_path), "%s", CTSVC_SOCKET_PATH);
 
-       cts_sockfd = socket(PF_UNIX, SOCK_STREAM, 0);
-       RETVM_IF(-1 == cts_sockfd, CONTACTS_ERROR_IPC,
+       __ctsvc_sockfd = socket(PF_UNIX, SOCK_STREAM, 0);
+       RETVM_IF(-1 == __ctsvc_sockfd, CONTACTS_ERROR_IPC,
                        "socket() Failed(errno = %d)", errno);
 
-       ret = connect(cts_sockfd, (struct sockaddr *)&caddr, sizeof(caddr));
+       ret = connect(__ctsvc_sockfd, (struct sockaddr *)&caddr, sizeof(caddr));
        if (-1 == ret) {
                CTS_ERR("connect() Failed(errno = %d)", errno);
-               close(cts_sockfd);
-               cts_sockfd = -1;
+               close(__ctsvc_sockfd);
+               __ctsvc_sockfd = -1;
                return CONTACTS_ERROR_IPC;
        }
 
-       ctsvc_conn_refcnt++;
+       __ctsvc_conn_refcnt++;
        return CONTACTS_ERROR_NONE;
 }
 
 void ctsvc_socket_final(void)
 {
-       if (1 < ctsvc_conn_refcnt) {
-               CTS_DBG("socket ref count : %d", ctsvc_conn_refcnt);
-               ctsvc_conn_refcnt--;
+       if (1 < __ctsvc_conn_refcnt) {
+               CTS_DBG("socket ref count : %d", __ctsvc_conn_refcnt);
+               __ctsvc_conn_refcnt--;
                return;
        }
-       else if (ctsvc_conn_refcnt < 1) {
-               CTS_DBG("Please call connection API. socket ref count : %d", ctsvc_conn_refcnt);
+       else if (__ctsvc_conn_refcnt < 1) {
+               CTS_DBG("Please call connection API. socket ref count : %d", __ctsvc_conn_refcnt);
                return;
        }
-       ctsvc_conn_refcnt--;
+       __ctsvc_conn_refcnt--;
 
-       close(cts_sockfd);
-       cts_sockfd = -1;
+       close(__ctsvc_sockfd);
+       __ctsvc_sockfd = -1;
 }
 
 static inline int __ctsvc_safe_write(int fd, const char *buf, int buf_size)
@@ -167,18 +167,18 @@ int ctsvc_request_sim_import(void)
        int i, ret;
        ctsvc_socket_msg_s msg = {0};
 
-       RETVM_IF(-1 == cts_sockfd, CONTACTS_ERROR_IPC, "socket is not connected");
+       RETVM_IF(-1 == __ctsvc_sockfd, CONTACTS_ERROR_IPC, "socket is not connected");
 
        msg.type = CTSVC_SOCKET_MSG_TYPE_REQUEST_IMPORT_SIM;
-       ret = __ctsvc_safe_write(cts_sockfd, (char *)&msg, sizeof(msg));
+       ret = __ctsvc_safe_write(__ctsvc_sockfd, (char *)&msg, sizeof(msg));
        RETVM_IF(-1 == ret, CONTACTS_ERROR_IPC, "__ctsvc_safe_write() Failed(errno = %d)", errno);
 
-       ret = __ctsvc_socket_handle_return(cts_sockfd, &msg);
+       ret = __ctsvc_socket_handle_return(__ctsvc_sockfd, &msg);
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "__ctsvc_socket_handle_return() Failed(%d)", ret);
        CTS_DBG("attach_num = %d", msg.attach_num);
 
        for (i=0;i<msg.attach_num;i++)
-               __ctsvc_remove_invalid_msg(cts_sockfd, msg.attach_sizes[i]);
+               __ctsvc_remove_invalid_msg(__ctsvc_sockfd, msg.attach_sizes[i]);
 
        return msg.val;
 }
@@ -189,17 +189,17 @@ int ctsvc_request_sim_get_initialization_status(bool *completed)
        ctsvc_socket_msg_s msg = {0};
        char dest[CTSVC_SOCKET_MSG_SIZE] = {0};
 
-       RETVM_IF(-1 == cts_sockfd, CONTACTS_ERROR_IPC, "socket is not connected");
+       RETVM_IF(-1 == __ctsvc_sockfd, CONTACTS_ERROR_IPC, "socket is not connected");
 
        msg.type = CTSVC_SOCKET_MSG_TYPE_REQUEST_SIM_INIT_COMPLETE;
-       ret = __ctsvc_safe_write(cts_sockfd, (char *)&msg, sizeof(msg));
+       ret = __ctsvc_safe_write(__ctsvc_sockfd, (char *)&msg, sizeof(msg));
        RETVM_IF(-1 == ret, CONTACTS_ERROR_IPC, "__ctsvc_safe_write() Failed(errno = %d)", errno);
 
-       ret = __ctsvc_socket_handle_return(cts_sockfd, &msg);
+       ret = __ctsvc_socket_handle_return(__ctsvc_sockfd, &msg);
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "__ctsvc_socket_handle_return() Failed(%d)", ret);
        CTS_DBG("attach_num = %d", msg.attach_num);
 
-       ret = __ctsvc_safe_read(cts_sockfd, dest, msg.attach_sizes[0]);
+       ret = __ctsvc_safe_read(__ctsvc_sockfd, dest, msg.attach_sizes[0]);
        RETVM_IF(-1 == ret, CONTACTS_ERROR_IPC, "__ctsvc_safe_read() Failed(errno = %d)", errno);
 
        if(atoi(dest) ==0)
index b20f15e..66b2404 100644 (file)
@@ -453,7 +453,7 @@ typedef enum {
        CTSVC_PROPERTY_PHONELOG_STAT_LOG_COUNT = (CTSVC_PROPERTY_PHONELOG_STAT | CTSVC_VIEW_DATA_TYPE_INT | CTSVC_READ_ONLY_PROPERTY ),
        CTSVC_PROPERTY_PHONELOG_STAT_LOG_TYPE = (CTSVC_PROPERTY_PHONELOG_STAT | CTSVC_VIEW_DATA_TYPE_INT | CTSVC_READ_ONLY_PROPERTY ) +1,
 
-}cts_property_ids_e;
+}ctsvc_property_ids_e;
 
 
 
index 2ef9bac..81ab1a9 100644 (file)
@@ -68,19 +68,19 @@ static int __ctsvc_db_activity_photo_insert_record( ctsvc_activity_photo_s *phot
                                "activity_id, photo_url, sort_index) "
                                "VALUES(%d, ?, %d)",
                                activity_id, photo->sort_index);
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       cts_stmt_bind_text(stmt, 1, photo->photo_url);
+       ctsvc_stmt_bind_text(stmt, 1, photo->photo_url);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -127,33 +127,33 @@ static int __ctsvc_db_activity_insert_record( contacts_record_h record, int *id
                        "VALUES(%d, ?, ?, %d, ?, ?)",
                        activity->contact_id, activity->timestamp);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Fail(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        if (activity->source_name)
-               cts_stmt_bind_text(stmt, 1, activity->source_name);
+               ctsvc_stmt_bind_text(stmt, 1, activity->source_name);
        if (activity->status)
-               cts_stmt_bind_text(stmt, 2, activity->status);
+               ctsvc_stmt_bind_text(stmt, 2, activity->status);
        if (activity->service_operation)
-               cts_stmt_bind_text(stmt, 3, activity->service_operation);
+               ctsvc_stmt_bind_text(stmt, 3, activity->service_operation);
        if (activity->uri)
-               cts_stmt_bind_text(stmt, 4, activity->uri);
+               ctsvc_stmt_bind_text(stmt, 4, activity->uri);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
 
-       activity_id = cts_db_get_last_insert_id();
+       activity_id = ctsvc_db_get_last_insert_id();
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        if (activity->photos) {
                ret = contacts_list_get_count((contacts_list_h)activity->photos, &count);
@@ -241,14 +241,14 @@ static int __ctsvc_db_activity_photo_get_records(int id, contacts_record_h recor
                                                "FROM "CTS_TABLE_ACTIVITY_PHOTOS" WHERE activity_id = %d "
                                                "ORDER BY sort_index ASC", id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -258,7 +258,7 @@ static int __ctsvc_db_activity_photo_get_records(int id, contacts_record_h recor
                ctsvc_list_prepend(list, record);
        }
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ((ctsvc_activity_s*)record)->photos = (ctsvc_list_s*)list;
 
@@ -276,18 +276,21 @@ static int __ctsvc_db_activity_get_record( int id, contacts_record_h* out_record
                                        "timestamp, service_operation, uri "
                                        "FROM "CTSVC_DB_VIEW_ACTIVITY" WHERE id = %d", id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return ret;
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        __ctsvc_db_activity_value_set(stmt, &record);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        __ctsvc_db_activity_photo_get_records(id, record);
 
@@ -358,15 +361,15 @@ static int __ctsvc_db_activity_get_all_records( int offset, int limit,
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -374,13 +377,13 @@ static int __ctsvc_db_activity_get_all_records( int offset, int limit,
                ret = contacts_db_get_record(_contacts_activity._uri, activity_id, &record);
                if (CONTACTS_ERROR_NONE != ret) {
                        CTS_ERR("DB error : contacts_db_get_record() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
-                       return CONTACTS_ERROR_NO_DATA;
+                       return ret;
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -423,11 +426,11 @@ static int __ctsvc_db_activity_get_records_with_query( contacts_query_h query, i
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -490,7 +493,7 @@ static int __ctsvc_db_activity_get_records_with_query( contacts_query_h query, i
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index efa024c..4ecc8e7 100644 (file)
@@ -217,18 +217,21 @@ static int __ctsvc_db_address_get_record( int id, contacts_record_h* out_record
                                                "WHERE datatype=%d AND id = %d ",
                                                CTSVC_DATA_POSTAL, id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/  != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return ret;
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_address_get_value_from_stmt(stmt, (contacts_record_h*)&address, 0);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        *out_record = (contacts_record_h)address;
 
@@ -257,21 +260,21 @@ static int __ctsvc_db_address_get_all_records( int offset, int limit, contacts_l
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_address_get_value_from_stmt(stmt, (contacts_record_h*)&address, 0);
                ctsvc_list_prepend(list, (contacts_record_h)address);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -296,11 +299,11 @@ static int __ctsvc_db_address_get_records_with_query( contacts_query_h query, in
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -377,7 +380,7 @@ static int __ctsvc_db_address_get_records_with_query( contacts_query_h query, in
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 04aae50..daabea9 100644 (file)
@@ -81,43 +81,35 @@ int ctsvc_db_address_insert(contacts_record_h record, int contact_id, bool is_my
                                                "VALUES(%d, %d, %d, %d, %d, ?, ?, ?, ?, ?, ?, ?, ?)",
                                contact_id, is_my_profile, CTSVC_DATA_POSTAL, address->is_default, address->type);
 
-               stmt = cts_query_prepare(query);
-               RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
                if (address->label)
-                       sqlite3_bind_text(stmt, 1, address->label,
-                                       strlen(address->label), SQLITE_STATIC);
+                       ctsvc_stmt_bind_text(stmt, 1, address->label);
                if (address->pobox)
-                       sqlite3_bind_text(stmt, 2, address->pobox,
-                                       strlen(address->pobox), SQLITE_STATIC);
+                       ctsvc_stmt_bind_text(stmt, 2, address->pobox);
                if (address->postalcode)
-                       sqlite3_bind_text(stmt, 3, address->postalcode,
-                                       strlen(address->postalcode), SQLITE_STATIC);
+                       ctsvc_stmt_bind_text(stmt, 3, address->postalcode);
                if (address->region)
-                       sqlite3_bind_text(stmt, 4, address->region,
-                                       strlen(address->region), SQLITE_STATIC);
+                       ctsvc_stmt_bind_text(stmt, 4, address->region);
                if (address->locality)
-                       sqlite3_bind_text(stmt, 5, address->locality,
-                                       strlen(address->locality), SQLITE_STATIC);
+                       ctsvc_stmt_bind_text(stmt, 5, address->locality);
                if (address->street)
-                       sqlite3_bind_text(stmt, 6, address->street,
-                                       strlen(address->street), SQLITE_STATIC);
+                       ctsvc_stmt_bind_text(stmt, 6, address->street);
                if (address->extended)
-                       sqlite3_bind_text(stmt, 7, address->extended,
-                                       strlen(address->extended), SQLITE_STATIC);
+                       ctsvc_stmt_bind_text(stmt, 7, address->extended);
                if (address->country)
-                       sqlite3_bind_text(stmt, 8, address->country,
-                                       strlen(address->country), SQLITE_STATIC);
+                       ctsvc_stmt_bind_text(stmt, 8, address->country);
 
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        return ret;
                }
                if (id)
-                       *id = cts_db_get_last_insert_id();
-               cts_stmt_finalize(stmt);
+                       *id = ctsvc_db_get_last_insert_id();
+               ctsvc_stmt_finalize(stmt);
 
                if (!is_my_profile)
                        ctsvc_set_address_noti();
@@ -175,7 +167,7 @@ int ctsvc_db_address_delete(int id, bool is_my_profile)
                        CTSVC_DATA_POSTAL, id);
 
        ret = ctsvc_query_exec(query);
-       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : cts_query_exec() Fail(%d)", ret);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_query_exec() Fail(%d)", ret);
 
        if (!is_my_profile)
                ctsvc_set_address_noti();
index abc023d..d7e6398 100644 (file)
@@ -95,13 +95,13 @@ static int __ctsvc_db_addressbook_get_record( int id, contacts_record_h* out_rec
                                "SELECT addressbook_id, addressbook_name, account_id, mode, last_sync_ver "
                                "FROM "CTS_TABLE_ADDRESSBOOKS" WHERE addressbook_id = %d", id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                if (CONTACTS_ERROR_NONE == ret)
                        return CONTACTS_ERROR_NO_DATA;
                else
@@ -110,7 +110,7 @@ static int __ctsvc_db_addressbook_get_record( int id, contacts_record_h* out_rec
 
        ret = __ctsvc_db_addressbook_value_set(stmt, &record);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("__ctsvc_db_addressbook_value_set(ALL) Failed(%d)", ret);
                return ret;
@@ -179,28 +179,28 @@ static int __ctsvc_db_addressbook_insert_record( contacts_record_h record, int *
                        "VALUES(?, %d, %d)",
                        CTS_TABLE_ADDRESSBOOKS, addressbook->account_id, addressbook->mode);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       cts_stmt_bind_text(stmt, 1, addressbook->name);
+       ctsvc_stmt_bind_text(stmt, 1, addressbook->name);
 
        /* DOING JOB */
        do {
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        break;
                }
 
-               //int index = cts_db_get_last_insert_id();
+               //int index = ctsvc_db_get_last_insert_id();
                if (id)
-                       *id = cts_db_get_last_insert_id();
-               cts_stmt_finalize(stmt);
+                       *id = ctsvc_db_get_last_insert_id();
+               ctsvc_stmt_finalize(stmt);
 
                ctsvc_set_addressbook_noti();
                ret = ctsvc_end_trans(true);
@@ -247,10 +247,9 @@ static int __ctsvc_db_addressbook_update_record( contacts_record_h record )
                        break;
 
                snprintf(query, sizeof(query), "UPDATE %s SET %s WHERE addressbook_id = %d", CTS_TABLE_ADDRESSBOOKS, set, addressbook->id);
-               stmt = cts_query_prepare(query);
+               ret = ctsvc_query_prepare(query, &stmt);
                if (NULL == stmt) {
-                       CTS_ERR("DB error : cts_query_prepare() Failed");
-                       ret = CONTACTS_ERROR_DB;
+                       CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                        break;
                }
                if (bind_text) {
@@ -258,16 +257,16 @@ static int __ctsvc_db_addressbook_update_record( contacts_record_h record )
                        for (cursor=bind_text,i=1;cursor;cursor=cursor->next,i++) {
                                const char *text = cursor->data;
                                if (text && *text)
-                                       cts_stmt_bind_text(stmt, i, text);
+                                       ctsvc_stmt_bind_text(stmt, i, text);
                        }
                }
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        break;
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
 
                ctsvc_set_addressbook_noti();
        } while (0);
@@ -393,7 +392,7 @@ static int __ctsvc_db_addressbook_delete_record( int addressbook_id )
                        break;
                }
 
-               ret = cts_db_change();
+               ret = ctsvc_db_change();
                if (0 < ret) {
                        ctsvc_set_my_profile_noti();
                        ctsvc_set_contact_noti();
@@ -408,7 +407,7 @@ static int __ctsvc_db_addressbook_delete_record( int addressbook_id )
 
                ret = ctsvc_person_do_garbage_collection();
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("DB error : cts_person_garbagecollection() Failed(%d)", ret);
+                       CTS_ERR("DB error : ctsvc_person_garbagecollection() Failed(%d)", ret);
                        break;
                }
 
@@ -447,23 +446,23 @@ static int __ctsvc_db_addressbook_get_all_records( int offset, int limit,
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
-                       return CONTACTS_ERROR_NO_DATA;
+                       return ret;
                }
                __ctsvc_db_addressbook_value_set(stmt, &record);
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -487,13 +486,13 @@ static int __ctsvc_db_addressbook_get_records_with_query( contacts_query_h query
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
-                       return CONTACTS_ERROR_NO_DATA;
+                       return ret;
                }
 
                contacts_record_create(_contacts_address_book._uri, &record);
@@ -537,7 +536,7 @@ static int __ctsvc_db_addressbook_get_records_with_query( contacts_query_h query
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
index d767cda..22ab6de 100644 (file)
@@ -46,7 +46,7 @@ int ctsvc_addressbook_delete(int account_id)
                return ret;\r
        }\r
 \r
-       ret = cts_db_change();\r
+       ret = ctsvc_db_change();\r
        if (0 < ret) {\r
                ctsvc_set_my_profile_noti();\r
                ctsvc_set_contact_noti();\r
@@ -62,7 +62,7 @@ int ctsvc_addressbook_delete(int account_id)
 \r
        ret = ctsvc_person_do_garbage_collection();\r
        if (CONTACTS_ERROR_NONE != ret) {\r
-               CTS_ERR("DB error : cts_person_garbagecollection() Failed(%d)", ret);\r
+               CTS_ERR("DB error : ctsvc_person_garbagecollection() Failed(%d)", ret);
                ctsvc_end_trans(false);\r
                return ret;\r
        }\r
index adab635..c803e8f 100644 (file)
@@ -77,18 +77,21 @@ static int __ctsvc_db_company_get_record( int id, contacts_record_h* out_record
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_COMPANY);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_company_get_value_from_stmt(stmt, out_record, 0);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -279,21 +282,21 @@ static int __ctsvc_db_company_get_all_records( int offset, int limit, contacts_l
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_company_get_value_from_stmt(stmt, (contacts_record_h*)&company, 0);
                ctsvc_list_prepend(list, (contacts_record_h)company);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -318,11 +321,11 @@ static int __ctsvc_db_company_get_records_with_query( contacts_query_h query, in
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -404,7 +407,7 @@ static int __ctsvc_db_company_get_records_with_query( contacts_query_h query, in
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 1eb90d9..cd8c54a 100644 (file)
@@ -34,8 +34,8 @@
 
 static int __ctsvc_company_bind_stmt(cts_stmt stmt, ctsvc_company_s *company, int start_cnt)
 {
-       cts_stmt_bind_int(stmt, start_cnt, company->is_default);
-       cts_stmt_bind_int(stmt, start_cnt+1, company->type);
+       ctsvc_stmt_bind_int(stmt, start_cnt, company->is_default);
+       ctsvc_stmt_bind_int(stmt, start_cnt+1, company->type);
        if (company->label)
                sqlite3_bind_text(stmt, start_cnt+2, company->label,
                        strlen(company->label), SQLITE_STATIC);
@@ -87,9 +87,9 @@ int ctsvc_db_company_insert(contacts_record_h record, int contact_id, bool is_my
                        || company->assistant_name || company->logo || company->location || company->description
                        || company->phonetic_name) {
 
-               ret = cts_db_get_next_id(CTS_TABLE_DATA);
+               ret = ctsvc_db_get_next_id(CTS_TABLE_DATA);
                if (ret < CONTACTS_ERROR_NONE) {
-                       CTS_ERR("cts_db_get_next_id() Failed(%d)", ret);
+                       CTS_ERR("ctsvc_db_get_next_id() Failed(%d)", ret);
                        ctsvc_end_trans(false);
                        return ret;
                }
@@ -101,8 +101,8 @@ int ctsvc_db_company_insert(contacts_record_h record, int contact_id, bool is_my
                                        "VALUES(%d, %d, %d, %d, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                                        company_id, contact_id, is_my_profile, CTSVC_DATA_COMPANY);
 
-               stmt = cts_query_prepare(query);
-               RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
                __ctsvc_company_bind_stmt(stmt, company, 1);
                if (company->logo) {
@@ -110,26 +110,26 @@ int ctsvc_db_company_insert(contacts_record_h record, int contact_id, bool is_my
                        ret = ctsvc_have_file_read_permission(company->logo);
                        if (ret != CONTACTS_ERROR_NONE) {
                                CTS_ERR("ctsvc_have_file_read_permission Fail(%d)", ret);
-                               cts_stmt_finalize(stmt);
+                               ctsvc_stmt_finalize(stmt);
                                return ret;
                        }
                        ctsvc_utils_make_image_file_name(contact_id, company_id, company->logo, image, sizeof(image));
                        ret = ctsvc_utils_copy_image(CTS_LOGO_IMAGE_LOCATION, company->logo, image);
                        if (CONTACTS_ERROR_NONE != ret) {
                                CTS_ERR("ctsvc_utils_copy_image() Failed(%d)", ret);
-                               cts_stmt_finalize(stmt);
+                               ctsvc_stmt_finalize(stmt);
                                return ret;
                        }
-                       cts_stmt_bind_text(stmt, 9, image);
+                       ctsvc_stmt_bind_text(stmt, 9, image);
                }
 
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        return ret;
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
 
                company->id = company_id;
                if (id)
@@ -205,11 +205,12 @@ int ctsvc_db_company_update(contacts_record_h record, int contact_id, bool is_my
 
        snprintf(query, sizeof(query),
                        "SELECT id, data8 FROM "CTS_TABLE_DATA" WHERE id = %d", company->id);
-       stmt = cts_query_prepare(query);
-       RETVM_IF(stmt == NULL, CONTACTS_ERROR_DB, "cts_query_prepare Fail");
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
+
+       ret = ctsvc_stmt_step(stmt);
        if (ret != 1) {
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                if (ret == CONTACTS_ERROR_NONE)
                        return CONTACTS_ERROR_NO_DATA;
                else
@@ -235,7 +236,7 @@ int ctsvc_db_company_update(contacts_record_h record, int contact_id, bool is_my
                                        ret = ctsvc_have_file_read_permission(company->logo);
                                        if (ret != CONTACTS_ERROR_NONE) {
                                                CTS_ERR("ctsvc_have_file_read_permission Fail(%d)", ret);
-                                               cts_stmt_finalize(stmt);
+                                               ctsvc_stmt_finalize(stmt);
                                                return ret;
                                        }
                                        check_permission = true;
@@ -254,7 +255,7 @@ int ctsvc_db_company_update(contacts_record_h record, int contact_id, bool is_my
                                ret = ctsvc_have_file_read_permission(company->logo);
                                if (ret != CONTACTS_ERROR_NONE) {
                                        CTS_ERR("ctsvc_have_file_read_permission Fail(%d)", ret);
-                                       cts_stmt_finalize(stmt);
+                                       ctsvc_stmt_finalize(stmt);
                                        return ret;
                                }
                        }
@@ -262,14 +263,14 @@ int ctsvc_db_company_update(contacts_record_h record, int contact_id, bool is_my
                        ret = ctsvc_utils_copy_image(CTS_LOGO_IMAGE_LOCATION, company->logo, dest);
                        if (CONTACTS_ERROR_NONE != ret) {
                                CTS_ERR("cts_copy_file() Failed(%d)", ret);
-                               cts_stmt_finalize(stmt);
+                               ctsvc_stmt_finalize(stmt);
                                return ret;
                        }
                        free(company->logo);
                        company->logo = strdup(dest);
                }
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        do {
                if (CONTACTS_ERROR_NONE != (ret = ctsvc_db_create_set_query(record, &set, &bind_text))) break;
index 57ce437..c95d264 100644 (file)
@@ -91,14 +91,17 @@ static int __ctsvc_db_get_contact_base_info(int id, ctsvc_contact_s *contact)
                                "FROM "CTS_TABLE_CONTACTS" WHERE contact_id = %d AND deleted = 0",
                                ctsvc_get_display_column(), id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        i = 0;
@@ -133,7 +136,7 @@ static int __ctsvc_db_get_contact_base_info(int id, ctsvc_contact_s *contact)
        contact->sort_name = SAFE_STRDUP(temp);
        temp = ctsvc_stmt_get_text(stmt, i++);
        contact->reverse_sort_name = SAFE_STRDUP(temp);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -153,13 +156,13 @@ static int __ctsvc_db_get_data(int id, ctsvc_contact_s *contact)
                                        "WHERE data.contact_id = %d  AND is_my_profile = 0 "
                                        "ORDER BY is_default DESC", id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE */!= ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
@@ -213,9 +216,9 @@ static int __ctsvc_db_get_data(int id, ctsvc_contact_s *contact)
                        break;
                }
 
-       }while(1 /*CTS_TRUE*/ == cts_stmt_step(stmt));
+       }while(1 /*CTS_TRUE*/ == ctsvc_stmt_step(stmt));
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 
@@ -224,6 +227,7 @@ static int __ctsvc_db_get_data(int id, ctsvc_contact_s *contact)
 static inline int __ctsvc_get_contact_grouprel(int contact_id, ctsvc_contact_s *contact)
 {
        CTS_FN_CALL;
+       int ret;
        ctsvc_group_relation_s *grouprel;
        cts_stmt stmt = NULL;
        char query[CTS_SQL_MAX_LEN] = {0};
@@ -233,10 +237,10 @@ static inline int __ctsvc_get_contact_grouprel(int contact_id, ctsvc_contact_s *
                "SELECT group_id, contact_id, group_name "
                        " FROM "CTSVC_DB_VIEW_GROUP_RELATION" WHERE contact_id = %d", contact_id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       while (1 /*CTS_TRUE */ == cts_stmt_step(stmt)) {
+       while (1 /*CTS_TRUE */ == ctsvc_stmt_step(stmt)) {
                contacts_record_create(_contacts_group_relation._uri, (contacts_record_h*)&grouprel);
 
                if (grouprel) {
@@ -250,7 +254,7 @@ static inline int __ctsvc_get_contact_grouprel(int contact_id, ctsvc_contact_s *
                }
        }
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse((contacts_list_h)contact->grouprelations);
        return CONTACTS_ERROR_NONE;
 }
@@ -976,26 +980,26 @@ static inline int __ctsvc_contact_refresh_lookup_data(int contact_id)
                                                                "VALUES(%d, %d, ?, %d)",        CTS_TABLE_NAME_LOOKUP, name_record->id,
                                                                contact_id, 0);
 
-                               stmt = cts_query_prepare(query);
+                               ret = ctsvc_query_prepare(query, &stmt);
                                if (NULL == stmt) {
-                                       CTS_ERR("cts_query_prepare() Failed");
+                                       CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                                        free(temp_name);
                                        free(normalized_name);
-                                       return CONTACTS_ERROR_DB;
+                                       return ret;
                                }
 
                                if (normalized_name)
-                                       cts_stmt_bind_text(stmt, 1, normalized_name);
+                                       ctsvc_stmt_bind_text(stmt, 1, normalized_name);
 
-                               ret = cts_stmt_step(stmt);
+                               ret = ctsvc_stmt_step(stmt);
 
                                free(temp_name);
                                free(normalized_name);
 
-                               cts_stmt_finalize(stmt);
+                               ctsvc_stmt_finalize(stmt);
 
                                if (CONTACTS_ERROR_NONE != ret) {
-                                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
+                                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
                                        contacts_record_destroy((contacts_record_h)contact, true);
                                        return CONTACTS_ERROR_DB;
                                }
@@ -1021,39 +1025,36 @@ static inline int __ctsvc_contact_refresh_lookup_data(int contact_id)
                                                                "VALUES(%d, %d, ?, ?)", CTS_TABLE_PHONE_LOOKUP, number_record->id,
                                                                contact_id);
 
-                               stmt = cts_query_prepare(query);
-                               if (NULL == stmt) {
-                                       CTS_ERR("cts_query_prepare() Failed");
-                                       return CONTACTS_ERROR_DB;
-                               }
+                               ret = ctsvc_query_prepare(query, &stmt);
+                               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
                                if (*clean_num)
-                                       cts_stmt_bind_text(stmt, 1, clean_num);
+                                       ctsvc_stmt_bind_text(stmt, 1, clean_num);
                                if (number_record->lookup)
-                                       cts_stmt_bind_text(stmt, 2, number_record->lookup);
-                               ret = cts_stmt_step(stmt);
+                                       ctsvc_stmt_bind_text(stmt, 2, number_record->lookup);
+                               ret = ctsvc_stmt_step(stmt);
                                if (CONTACTS_ERROR_NONE != ret) {
-                                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                                       cts_stmt_finalize(stmt);
+                                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                                       ctsvc_stmt_finalize(stmt);
                                        contacts_record_destroy((contacts_record_h)contact, true);
                                        return CONTACTS_ERROR_DB;
                                }
                                ret = ctsvc_normalize_number(clean_num, normal_num, sizeof(normal_num));
                                if (ret > 0 && strcmp(clean_num, normal_num) != 0) {
-                                       cts_stmt_reset(stmt);
+                                       ctsvc_stmt_reset(stmt);
                                        if (*normal_num)
-                                               cts_stmt_bind_text(stmt, 1, normal_num);
+                                               ctsvc_stmt_bind_text(stmt, 1, normal_num);
                                        if (number_record->lookup)
-                                               cts_stmt_bind_text(stmt, 2, number_record->lookup);
-                                       ret = cts_stmt_step(stmt);
+                                               ctsvc_stmt_bind_text(stmt, 2, number_record->lookup);
+                                       ret = ctsvc_stmt_step(stmt);
                                        if (CONTACTS_ERROR_NONE != ret) {
-                                               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                                               cts_stmt_finalize(stmt);
+                                               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                                               ctsvc_stmt_finalize(stmt);
                                                contacts_record_destroy((contacts_record_h)contact, true);
                                                return CONTACTS_ERROR_DB;
                                        }
                                }
-                               cts_stmt_finalize(stmt);
+                               ctsvc_stmt_finalize(stmt);
                        }
                }while(CONTACTS_ERROR_NONE == contacts_list_next(number_list));
        }
@@ -1072,24 +1073,24 @@ static inline int __ctsvc_contact_refresh_lookup_data(int contact_id)
                                                                "VALUES(%d, %d, ?, %d)",        CTS_TABLE_NAME_LOOKUP, nickname->id,
                                                                contact_id,  0);
 
-                               stmt = cts_query_prepare(query);
+                               ret = ctsvc_query_prepare(query, &stmt);
                                if (NULL == stmt) {
-                                       CTS_ERR("cts_query_prepare() Failed");
+                                       CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                                        free(normalized_nickname);
-                                       return CONTACTS_ERROR_DB;
+                                       return ret;
                                }
 
                                if (normalized_nickname && *normalized_nickname)
-                                       cts_stmt_bind_text(stmt, 1, normalized_nickname);
+                                       ctsvc_stmt_bind_text(stmt, 1, normalized_nickname);
 
-                               ret = cts_stmt_step(stmt);
+                               ret = ctsvc_stmt_step(stmt);
 
                                free(normalized_nickname);
 
-                               cts_stmt_finalize(stmt);
+                               ctsvc_stmt_finalize(stmt);
 
                                if (CONTACTS_ERROR_NONE != ret) {
-                                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
+                                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
                                        contacts_record_destroy((contacts_record_h)contact, true);
                                        return CONTACTS_ERROR_DB;
                                }
@@ -1119,41 +1120,41 @@ static inline int __ctsvc_update_contact_search_data(int contact_id)
                        "WHERE contact_id = %d",
                        CTS_TABLE_SEARCH_INDEX, contact_id);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare() Failed");
+               CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        ret = __ctsvc_contact_make_search_data(contact_id, &search_name, &search_number, &search_data);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("__ctsvc_contact_make_search_data() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
 
        if (search_name)
-               cts_stmt_bind_text(stmt, 1, search_name);
+               ctsvc_stmt_bind_text(stmt, 1, search_name);
        if(search_number)
-               cts_stmt_bind_text(stmt, 2, search_number);
+               ctsvc_stmt_bind_text(stmt, 2, search_number);
        if(search_data)
-               cts_stmt_bind_text(stmt, 3, search_data);
+               ctsvc_stmt_bind_text(stmt, 3, search_data);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
 
        free(search_name);
        free(search_number);
        free(search_data);
 
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ret = __ctsvc_contact_refresh_lookup_data(contact_id);
        if (CONTACTS_ERROR_NONE != ret) {
@@ -1320,10 +1321,9 @@ static int __ctsvc_db_contact_update_record( contacts_record_h record )
 
                snprintf(query, sizeof(query), "UPDATE %s SET %s WHERE contact_id = %d", CTS_TABLE_CONTACTS, query_set, contact->id);
 
-               stmt = cts_query_prepare(query);
+               ret = ctsvc_query_prepare(query, &stmt);
                if (NULL == stmt) {
-                       CTS_ERR("DB error : cts_query_prepare() Failed");
-                       ret = CONTACTS_ERROR_DB;
+                       CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                        break;
                }
 
@@ -1332,16 +1332,16 @@ static int __ctsvc_db_contact_update_record( contacts_record_h record )
                        for (cursor=bind_text,i=1;cursor;cursor=cursor->next,i++) {
                                const char *text = cursor->data;
                                if (*text)
-                                       cts_stmt_bind_text(stmt, i, text);
+                                       ctsvc_stmt_bind_text(stmt, i, text);
                        }
                }
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        break;
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
        } while (0);
 
        if (CONTACTS_ERROR_NONE != ret) {
@@ -1395,15 +1395,15 @@ static int __ctsvc_db_contact_get_all_records( int offset, int limit, contacts_l
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -1411,13 +1411,13 @@ static int __ctsvc_db_contact_get_all_records( int offset, int limit, contacts_l
                ret = ctsvc_db_contact_get(contact_id, &record);
                if (CONTACTS_ERROR_NONE != ret) {
                        CTS_ERR("DB error : ctsvc_db_contact_get() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
-                       return CONTACTS_ERROR_NO_DATA;
+                       return ret;
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -1475,11 +1475,11 @@ static int __ctsvc_db_contact_get_records_with_query( contacts_query_h query, in
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -1570,7 +1570,7 @@ static int __ctsvc_db_contact_get_records_with_query( contacts_query_h query, in
                ret = __ctsvc_db_contact_get_changed_ver(contact);
                if (CONTACTS_ERROR_NONE != ret) {
                        CTS_ERR("__ctsvc_db_contact_get_changed_ver Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -1578,7 +1578,7 @@ static int __ctsvc_db_contact_get_records_with_query( contacts_query_h query, in
                ret = __ctsvc_db_get_data(contact_id, contact);
                if (CONTACTS_ERROR_NONE != ret && CONTACTS_ERROR_NO_DATA != ret) {
                        CTS_ERR("ctsvc_get_data_info Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -1586,14 +1586,14 @@ static int __ctsvc_db_contact_get_records_with_query( contacts_query_h query, in
                ret = __ctsvc_get_contact_grouprel(contact_id, contact);
                if (CONTACTS_ERROR_NONE != ret) {
                        CTS_ERR("ctsvc_get_group_relations Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -1748,7 +1748,7 @@ static inline int __ctsvc_contact_insert_search_data(int contact_id)
        char *search_data = NULL;
 
        ret = ctsvc_begin_trans();
-       RETVM_IF(ret, ret, "contacts_svc_begin_trans() Failed(%d)", ret);
+       RETVM_IF(ret, ret, "contacts_begin_trans() Failed(%d)", ret);
 
        snprintf(query, sizeof(query), "DELETE FROM %s WHERE contact_id = %d",
                        CTS_TABLE_SEARCH_INDEX, contact_id);
@@ -1763,41 +1763,41 @@ static inline int __ctsvc_contact_insert_search_data(int contact_id)
                        "VALUES(%d, ?, ?, ?)",
                        CTS_TABLE_SEARCH_INDEX, contact_id);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare() Failed");
+               CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        ret = __ctsvc_contact_make_search_data(contact_id, &search_name, &search_number, &search_data);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("__ctsvc_contact_make_search_data() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
 
        if(search_name)
-               cts_stmt_bind_text(stmt, 1, search_name);
+               ctsvc_stmt_bind_text(stmt, 1, search_name);
        if(search_number)
-               cts_stmt_bind_text(stmt, 2, search_number);
+               ctsvc_stmt_bind_text(stmt, 2, search_number);
        if(search_data)
-               cts_stmt_bind_text(stmt, 3, search_data);
+               ctsvc_stmt_bind_text(stmt, 3, search_data);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
 
        free(search_name);
        free(search_number);
        free(search_data);
 
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ret = __ctsvc_contact_refresh_lookup_data(contact_id);
 
@@ -1932,7 +1932,7 @@ static int __ctsvc_db_contact_insert_record( contacts_record_h record, int *id)
 
        ctsvc_contact_s *contact = (ctsvc_contact_s*)record;
        int rel_changed = 0;
-       cts_stmt stmt;
+       cts_stmt stmt = NULL;
 
        // These check should be done in client side
        RETVM_IF(NULL == contact, CONTACTS_ERROR_INVALID_PARAMETER,
@@ -1948,9 +1948,9 @@ static int __ctsvc_db_contact_insert_record( contacts_record_h record, int *id)
        ret = ctsvc_begin_trans();
        RETVM_IF(ret < CONTACTS_ERROR_NONE, ret, "ctsvc_begin_trans() Failed(%d)", ret);
 
-       ret = cts_db_get_next_id(CTS_TABLE_CONTACTS);
+       ret = ctsvc_db_get_next_id(CTS_TABLE_CONTACTS);
        if (ret < CONTACTS_ERROR_NONE) {
-               CTS_ERR("cts_db_get_next_id() Failed(%d)", ret);
+               CTS_ERR("ctsvc_db_get_next_id() Failed(%d)", ret);
                ctsvc_end_trans(false);
                return ret;
        }
@@ -2010,7 +2010,7 @@ static int __ctsvc_db_contact_insert_record( contacts_record_h record, int *id)
                }
                else {
                        ret = ctsvc_db_insert_person((contacts_record_h)contact);
-                       CTS_DBG("ctsvc_db_insert_person return %d, person_id(%d)", ret, person_id);
+                       CTS_DBG("ctsvc_db_insert_person return %d, person_id(%d)", ret, ret);
                        if (ret < CONTACTS_ERROR_NONE) {
                                CTS_ERR("ctsvc_db_insert_person() Failed(%d)", ret);
                                ctsvc_end_trans(false);
@@ -2021,7 +2021,7 @@ static int __ctsvc_db_contact_insert_record( contacts_record_h record, int *id)
        }
        else {
                ret = ctsvc_db_insert_person((contacts_record_h)contact);
-               CTS_DBG("ctsvc_db_insert_person return %d, person_id(%d)", ret, person_id);
+               CTS_DBG("ctsvc_db_insert_person return %d, person_id(%d)", ret, ret);
                if (ret < CONTACTS_ERROR_NONE) {
                        CTS_ERR("ctsvc_db_insert_person() Failed(%d)", ret);
                        ctsvc_end_trans(false);
@@ -2045,44 +2045,44 @@ static int __ctsvc_db_contact_insert_record( contacts_record_h record, int *id)
                        (NULL !=contact->image_thumbnail_path)?version:0, contact->has_phonenumber, contact->has_email,
                        contact->display_source_type, contact->display_name_language, contact->reverse_display_name_language);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare() Failed");
+               CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        if (contact->display_name)
-               cts_stmt_bind_text(stmt, 1, contact->display_name);
+               ctsvc_stmt_bind_text(stmt, 1, contact->display_name);
        if (contact->reverse_display_name)
-               cts_stmt_bind_text(stmt, 2, contact->reverse_display_name);
+               ctsvc_stmt_bind_text(stmt, 2, contact->reverse_display_name);
        if (contact->sort_name)
-               cts_stmt_bind_text(stmt, 3, contact->sort_name);
+               ctsvc_stmt_bind_text(stmt, 3, contact->sort_name);
        if (contact->reverse_sort_name)
-               cts_stmt_bind_text(stmt, 4, contact->reverse_sort_name);
+               ctsvc_stmt_bind_text(stmt, 4, contact->reverse_sort_name);
        if (contact->sortkey)
-               cts_stmt_bind_text(stmt, 5, contact->sortkey);
+               ctsvc_stmt_bind_text(stmt, 5, contact->sortkey);
        if (contact->reverse_sortkey)
-               cts_stmt_bind_text(stmt, 6, contact->reverse_sortkey);
+               ctsvc_stmt_bind_text(stmt, 6, contact->reverse_sortkey);
        if (contact->uid)
-               cts_stmt_bind_text(stmt, 7, contact->uid);
+               ctsvc_stmt_bind_text(stmt, 7, contact->uid);
        if (contact->ringtone_path)
-               cts_stmt_bind_text(stmt, 8, contact->ringtone_path);
+               ctsvc_stmt_bind_text(stmt, 8, contact->ringtone_path);
        if (contact->vibration)
-               cts_stmt_bind_text(stmt, 9, contact->vibration);
+               ctsvc_stmt_bind_text(stmt, 9, contact->vibration);
        if (contact->message_alert)
-               cts_stmt_bind_text(stmt, 10, contact->message_alert);
+               ctsvc_stmt_bind_text(stmt, 10, contact->message_alert);
        if (contact->image_thumbnail_path)
-               cts_stmt_bind_text(stmt, 11, contact->image_thumbnail_path);
+               ctsvc_stmt_bind_text(stmt, 11, contact->image_thumbnail_path);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        //Insert group Info
        if (contact->grouprelations) {
@@ -2238,44 +2238,44 @@ static int __ctsvc_db_contact_replace_record( contacts_record_h record, int cont
 
        len += snprintf(query+len, sizeof(query)-len, " WHERE contact_id=%d", contact->id);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare() Failed");
+               CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        if (contact->display_name)
-               cts_stmt_bind_text(stmt, 1, contact->display_name);
+               ctsvc_stmt_bind_text(stmt, 1, contact->display_name);
        if (contact->reverse_display_name)
-               cts_stmt_bind_text(stmt, 2, contact->reverse_display_name);
+               ctsvc_stmt_bind_text(stmt, 2, contact->reverse_display_name);
        if (contact->sort_name)
-               cts_stmt_bind_text(stmt, 3, contact->sort_name);
+               ctsvc_stmt_bind_text(stmt, 3, contact->sort_name);
        if (contact->reverse_sort_name)
-               cts_stmt_bind_text(stmt, 4, contact->reverse_sort_name);
+               ctsvc_stmt_bind_text(stmt, 4, contact->reverse_sort_name);
        if (contact->sortkey)
-               cts_stmt_bind_text(stmt, 5, contact->sortkey);
+               ctsvc_stmt_bind_text(stmt, 5, contact->sortkey);
        if (contact->reverse_sortkey)
-               cts_stmt_bind_text(stmt, 6, contact->reverse_sortkey);
+               ctsvc_stmt_bind_text(stmt, 6, contact->reverse_sortkey);
        if (contact->uid)
-               cts_stmt_bind_text(stmt, 7, contact->uid);
+               ctsvc_stmt_bind_text(stmt, 7, contact->uid);
        if (contact->ringtone_path)
-               cts_stmt_bind_text(stmt, 8, contact->ringtone_path);
+               ctsvc_stmt_bind_text(stmt, 8, contact->ringtone_path);
        if (contact->vibration)
-               cts_stmt_bind_text(stmt, 9, contact->vibration);
+               ctsvc_stmt_bind_text(stmt, 9, contact->vibration);
        if (contact->message_alert)
-               cts_stmt_bind_text(stmt, 10, contact->message_alert);
+               ctsvc_stmt_bind_text(stmt, 10, contact->message_alert);
        if (contact->image_thumbnail_path)
-               cts_stmt_bind_text(stmt, 11, contact->image_thumbnail_path);
+               ctsvc_stmt_bind_text(stmt, 11, contact->image_thumbnail_path);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ctsvc_set_contact_noti();
        if (0 < rel_changed)
index e661bcb..63370dd 100644 (file)
@@ -101,25 +101,24 @@ static int __ctsvc_contact_get_current_image_file(int image_id, char *dest, int
        char query[CTS_SQL_MIN_LEN] = {0};
 
        snprintf(query, sizeof(query), "SELECT data3 FROM %s WHERE id = %d", CTS_TABLE_DATA, image_id);
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       stmt = cts_query_prepare(query);
-       if (NULL == stmt) {
-               CTS_ERR("DB error: cts_query_prepare() Failed");
-               return CONTACTS_ERROR_DB;
-       }
-
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("DB error: cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("DB error: ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        tmp_path = ctsvc_stmt_get_text(stmt, 0);
        if (tmp_path) {
                snprintf(dest, dest_size, "%s/%s", CTS_IMG_FULL_LOCATION, tmp_path);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        return CONTACTS_ERROR_NONE;
 }
 
@@ -226,17 +225,17 @@ int ctsvc_db_contact_delete(int contact_id)
                "SELECT addressbook_id, person_id "
                "FROM "CTS_TABLE_CONTACTS" WHERE contact_id = %d AND deleted = 0", contact_id);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                if (CONTACTS_ERROR_NONE == ret)
                        return CONTACTS_ERROR_NO_DATA;
@@ -247,7 +246,7 @@ int ctsvc_db_contact_delete(int contact_id)
        addressbook_id = ctsvc_stmt_get_int(stmt, 0);
        person_id = ctsvc_stmt_get_int(stmt, 1);
        CTS_DBG("addressbook_id : %d, person_id : %d", addressbook_id, person_id);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        version = ctsvc_get_next_ver();
        snprintf(query, sizeof(query),
@@ -260,7 +259,7 @@ int ctsvc_db_contact_delete(int contact_id)
                ctsvc_end_trans(false);
                return ret;
        }
-       rel_changed = cts_db_change();
+       rel_changed = ctsvc_db_change();
 
        snprintf(query, sizeof(query),
                        "UPDATE %s SET deleted = 1, person_id = 0, changed_ver=%d WHERE contact_id = %d",
@@ -2045,30 +2044,30 @@ int ctsvc_contact_update_display_name(int contact_id, contacts_display_name_sour
                                contact->display_name_language, contact->reverse_display_name_language,
                                ctsvc_get_next_ver(), (int)time(NULL), contact_id);
 
-               stmt = cts_query_prepare(query);
+               ret = ctsvc_query_prepare(query, &stmt);
                if (NULL == stmt) {
-                       CTS_ERR("DB error : cts_query_prepare() Failed");
+                       CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                        contacts_record_destroy(record, true);
-                       return CONTACTS_ERROR_DB;
+                       return ret;
                }
 
                if (contact->display_name)
-                       cts_stmt_bind_text(stmt, 1, contact->display_name);
+                       ctsvc_stmt_bind_text(stmt, 1, contact->display_name);
                if (contact->reverse_display_name)
-                       cts_stmt_bind_text(stmt, 2, contact->reverse_display_name);
+                       ctsvc_stmt_bind_text(stmt, 2, contact->reverse_display_name);
                if (contact->sort_name)
-                       cts_stmt_bind_text(stmt, 3, contact->sort_name);
+                       ctsvc_stmt_bind_text(stmt, 3, contact->sort_name);
                if (contact->reverse_sort_name)
-                       cts_stmt_bind_text(stmt, 4, contact->reverse_sort_name);
+                       ctsvc_stmt_bind_text(stmt, 4, contact->reverse_sort_name);
                if (contact->sortkey)
-                       cts_stmt_bind_text(stmt, 5, contact->sortkey);
+                       ctsvc_stmt_bind_text(stmt, 5, contact->sortkey);
                if (contact->reverse_sortkey)
-                       cts_stmt_bind_text(stmt, 6, contact->reverse_sortkey);
+                       ctsvc_stmt_bind_text(stmt, 6, contact->reverse_sortkey);
 
-               ret = cts_stmt_step(stmt);
-               WARN_IF(CONTACTS_ERROR_NONE != ret, "cts_stmt_step() Failed(%d)", ret);
+               ret = ctsvc_stmt_step(stmt);
+               WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_stmt_step() Failed(%d)", ret);
 
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
        }
 
        contacts_record_destroy(record, true);
index 07f84e0..6de35b3 100644 (file)
@@ -192,26 +192,26 @@ static int __ctsvc_db_email_insert_record( contacts_record_h record, int *id )
 
        snprintf(query, sizeof(query),
                        "SELECT addressbook_id, person_id FROM "CTSVC_DB_VIEW_CONTACT" WHERE contact_id = %d", email->contact_id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
-               if (CONTACTS_ERROR_NO_DATA)
+               if (CONTACTS_ERROR_NONE == ret)
                        return CONTACTS_ERROR_INVALID_PARAMETER;
                else
                        return ret;
        }
        addressbook_id = ctsvc_stmt_get_int(stmt, 0);
        person_id = ctsvc_stmt_get_int(stmt, 1);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        old_default_email_id = __ctsvc_db_email_get_default_email_id(email->contact_id);
        if (0 == old_default_email_id)
@@ -280,19 +280,22 @@ static int __ctsvc_db_email_get_record( int id, contacts_record_h* out_record )
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_EMAIL);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_email_get_value_from_stmt(stmt, out_record, 0);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -378,17 +381,17 @@ static int __ctsvc_db_email_delete_record( int id )
                        "SELECT contact_id, person_id FROM "CTSVC_DB_VIEW_CONTACT " "
                        "WHERE contact_id = (SELECT contact_id FROM "CTS_TABLE_DATA" WHERE id = %d)", id);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                if (CONTACTS_ERROR_NONE == ret)
                        return CONTACTS_ERROR_NO_DATA;
@@ -397,24 +400,27 @@ static int __ctsvc_db_email_delete_record( int id )
        }
        contact_id = ctsvc_stmt_get_int(stmt, 0);
        person_id = ctsvc_stmt_get_int(stmt, 1);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        snprintf(query, sizeof(query),
                        "SELECT is_default, is_primary_default FROM "CTS_TABLE_DATA" WHERE id = %d", id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_NO_DATA;
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
        is_default = ctsvc_stmt_get_int(stmt, 0);
        is_primary_default = ctsvc_stmt_get_int(stmt, 1);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ret = ctsvc_db_email_delete(id, false);
        if (CONTACTS_ERROR_NONE != ret) {
@@ -487,21 +493,21 @@ static int __ctsvc_db_email_get_all_records( int offset, int limit, contacts_lis
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_email_get_value_from_stmt(stmt, (contacts_record_h*)&email, 0);
                ctsvc_list_prepend(list, (contacts_record_h)email);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -526,11 +532,11 @@ static int __ctsvc_db_email_get_records_with_query( contacts_query_h query, int
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -583,7 +589,7 @@ static int __ctsvc_db_email_get_records_with_query( contacts_query_h query, int
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 4ce5f96..5a2dca7 100644 (file)
@@ -67,25 +67,25 @@ int ctsvc_db_email_insert(contacts_record_h record, int contact_id, bool is_my_p
                                                                        "VALUES(%d, %d, %d, %d, %d, ?, ?)",
                        contact_id, is_my_profile, CTSVC_DATA_EMAIL, email->is_default, email->type);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (email->label)
-               cts_stmt_bind_text(stmt, 1, email->label);
+               ctsvc_stmt_bind_text(stmt, 1, email->label);
        if (email->email_addr)
-               cts_stmt_bind_text(stmt, 2, email->email_addr);
+               ctsvc_stmt_bind_text(stmt, 2, email->email_addr);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("DB error : ctsvc_query_exec() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
-       //email->id = cts_db_get_last_insert_id();
+       //email->id = ctsvc_db_get_last_insert_id();
        if (id)
-               *id = cts_db_get_last_insert_id();
-       cts_stmt_finalize(stmt);
+               *id = ctsvc_db_get_last_insert_id();
+       ctsvc_stmt_finalize(stmt);
 
        if (!is_my_profile)
                ctsvc_set_email_noti();
index 53f3f5c..2144919 100644 (file)
@@ -130,19 +130,22 @@ static int __ctsvc_db_event_get_record( int id, contacts_record_h* out_record )
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_EVENT);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_event_get_value_from_stmt(stmt, out_record, 0);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -263,21 +266,21 @@ static int __ctsvc_db_event_get_all_records( int offset, int limit, contacts_lis
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_event_get_value_from_stmt(stmt, (contacts_record_h*)&event, 0);
                ctsvc_list_prepend(list, (contacts_record_h)event);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -302,11 +305,11 @@ static int __ctsvc_db_event_get_records_with_query( contacts_query_h query, int
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -361,7 +364,7 @@ static int __ctsvc_db_event_get_records_with_query( contacts_query_h query, int
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index cbafd2d..3934a13 100644 (file)
@@ -45,26 +45,26 @@ int ctsvc_db_event_insert(contacts_record_h record, int contact_id, bool is_my_p
                "INSERT INTO "CTS_TABLE_DATA"(contact_id, is_my_profile, datatype, data1, data2, data3, data4, data5) "
                                                                        "VALUES(%d, %d, %d, %d, ?, ?, %d, ?)",
                        contact_id, is_my_profile, CTSVC_DATA_EVENT, event->type, event->is_lunar);
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (event->label)
-               cts_stmt_bind_text(stmt, 1, event->label);
-       cts_stmt_bind_int(stmt, 2, event->date);
-       cts_stmt_bind_int(stmt, 3, event->lunar_date);
+               ctsvc_stmt_bind_text(stmt, 1, event->label);
+       ctsvc_stmt_bind_int(stmt, 2, event->date);
+       ctsvc_stmt_bind_int(stmt, 3, event->lunar_date);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("DB error : ctsvc_query_exec() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
-//     event->id = cts_db_get_last_insert_id();
+//     event->id = ctsvc_db_get_last_insert_id();
        if (id)
-               *id = cts_db_get_last_insert_id();
+               *id = ctsvc_db_get_last_insert_id();
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        if (!is_my_profile)
                ctsvc_set_event_noti();
index 0d2c38f..8ced2bc 100644 (file)
@@ -134,19 +134,22 @@ static int __ctsvc_db_extension_get_record( int id, contacts_record_h* out_recor
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_EXTENSION);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_extension_get_value_from_stmt(stmt, out_record, 0);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -272,21 +275,21 @@ static int __ctsvc_db_extension_get_all_records( int offset, int limit, contacts
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_extension_get_value_from_stmt(stmt, (contacts_record_h*)&extension, 0);
                ctsvc_list_prepend(list, (contacts_record_h)extension);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -311,11 +314,11 @@ static int __ctsvc_db_extension_get_records_with_query( contacts_query_h query,
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -401,7 +404,7 @@ static int __ctsvc_db_extension_get_records_with_query( contacts_query_h query,
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index b276e0a..ddd573e 100644 (file)
@@ -71,27 +71,27 @@ int ctsvc_db_extension_get_value_from_stmt(cts_stmt stmt, contacts_record_h *rec
 static inline int __ctsvc_extension_bind_stmt(cts_stmt stmt, ctsvc_extension_s *extension, int start_cnt)
 {
        if (extension->data2)
-               cts_stmt_bind_text(stmt, start_cnt, extension->data2);
+               ctsvc_stmt_bind_text(stmt, start_cnt, extension->data2);
        if (extension->data3)
-               cts_stmt_bind_text(stmt, start_cnt+1, extension->data3);
+               ctsvc_stmt_bind_text(stmt, start_cnt+1, extension->data3);
        if (extension->data4)
-               cts_stmt_bind_text(stmt, start_cnt+2, extension->data4);
+               ctsvc_stmt_bind_text(stmt, start_cnt+2, extension->data4);
        if (extension->data5)
-               cts_stmt_bind_text(stmt, start_cnt+3, extension->data5);
+               ctsvc_stmt_bind_text(stmt, start_cnt+3, extension->data5);
        if (extension->data6)
-               cts_stmt_bind_text(stmt, start_cnt+4, extension->data6);
+               ctsvc_stmt_bind_text(stmt, start_cnt+4, extension->data6);
        if (extension->data7)
-               cts_stmt_bind_text(stmt, start_cnt+5, extension->data7);
+               ctsvc_stmt_bind_text(stmt, start_cnt+5, extension->data7);
        if (extension->data8)
-               cts_stmt_bind_text(stmt, start_cnt+6, extension->data8);
+               ctsvc_stmt_bind_text(stmt, start_cnt+6, extension->data8);
        if (extension->data9)
-               cts_stmt_bind_text(stmt, start_cnt+7, extension->data9);
+               ctsvc_stmt_bind_text(stmt, start_cnt+7, extension->data9);
        if (extension->data10)
-               cts_stmt_bind_text(stmt, start_cnt+8, extension->data10);
+               ctsvc_stmt_bind_text(stmt, start_cnt+8, extension->data10);
        if (extension->data11)
-               cts_stmt_bind_text(stmt, start_cnt+9, extension->data11);
+               ctsvc_stmt_bind_text(stmt, start_cnt+9, extension->data11);
        if (extension->data12)
-               cts_stmt_bind_text(stmt, start_cnt+10, extension->data12);
+               ctsvc_stmt_bind_text(stmt, start_cnt+10, extension->data12);
        return CONTACTS_ERROR_NONE;
 }
 
@@ -116,22 +116,22 @@ int ctsvc_db_extension_insert(contacts_record_h record, int contact_id, bool is_
                                                                "VALUES(%d, %d, %d, %d, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                                                contact_id, is_my_profile, CTSVC_DATA_EXTENSION, extension->data1);
 
-               stmt = cts_query_prepare(query);
-               RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
                __ctsvc_extension_bind_stmt(stmt, extension, 1);
 
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
                        CTS_ERR("DB error : ctsvc_query_exec() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        return ret;
                }
 
-//             extension->id = cts_db_get_last_insert_id();
+//             extension->id = ctsvc_db_get_last_insert_id();
                if (id)
-                       *id = cts_db_get_last_insert_id();
-               cts_stmt_finalize(stmt);
+                       *id = ctsvc_db_get_last_insert_id();
+               ctsvc_stmt_finalize(stmt);
 
                if (!is_my_profile)
                        ctsvc_set_data_noti();
index 811d21f..937235f 100644 (file)
@@ -68,13 +68,13 @@ static double __ctsvc_db_group_get_next_group_prio(void)
 
        snprintf(query, sizeof(query), "SELECT MAX(group_prio) FROM "CTS_TABLE_GROUPS" ");
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/  == ret)
                prio = ctsvc_stmt_get_dbl(stmt, 0);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return prio + 1.0;
 }
@@ -98,7 +98,7 @@ static int __ctsvc_db_group_insert_record( contacts_record_h record, int *id )
        RETVM_IF( ret < CONTACTS_ERROR_NONE, ret,  "DB error : ctsvc_begin_trans() Failed(%d)", ret);
 
        group_prio = __ctsvc_db_group_get_next_group_prio();
-       group->id = cts_db_get_next_id(CTS_TABLE_GROUPS);
+       group->id = ctsvc_db_get_next_id(CTS_TABLE_GROUPS);
        if (id)
                *id = group->id;
 
@@ -108,33 +108,33 @@ static int __ctsvc_db_group_insert_record( contacts_record_h record, int *id )
                        "VALUES(%d, %d, ?, ?, ?, ?, ?, ?, ?, ?, %d, %lf)",
                        group->id, group->addressbook_id, group->is_read_only, group_prio);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       cts_stmt_bind_text(stmt, 1, group->name);
+       ctsvc_stmt_bind_text(stmt, 1, group->name);
 
        ver = ctsvc_get_next_ver();
 
-       cts_stmt_bind_int(stmt, 2, ver);
-       cts_stmt_bind_int(stmt, 3, ver);
+       ctsvc_stmt_bind_int(stmt, 2, ver);
+       ctsvc_stmt_bind_int(stmt, 3, ver);
 
        if (group->ringtone_path)
-               cts_stmt_bind_text(stmt, 4, group->ringtone_path);
+               ctsvc_stmt_bind_text(stmt, 4, group->ringtone_path);
        if (group->vibration)
-               cts_stmt_bind_text(stmt, 5, group->vibration);
+               ctsvc_stmt_bind_text(stmt, 5, group->vibration);
        if (group->message_alert)
-               cts_stmt_bind_text(stmt, 6, group->message_alert);
+               ctsvc_stmt_bind_text(stmt, 6, group->message_alert);
 
        if(group->image_thumbnail_path) {
                char image[CTSVC_IMG_FULL_PATH_SIZE_MAX] = {0};
                ret = ctsvc_have_file_read_permission(group->image_thumbnail_path);
                if (ret != CONTACTS_ERROR_NONE) {
                        CTS_ERR("ctsvc_have_file_read_permission Fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        ctsvc_end_trans(false);
                        return ret;
                }
@@ -143,30 +143,30 @@ static int __ctsvc_db_group_insert_record( contacts_record_h record, int *id )
                ret = ctsvc_utils_copy_image(CTS_GROUP_IMAGE_LOCATION, group->image_thumbnail_path, image);
                if (CONTACTS_ERROR_NONE != ret) {
                        CTS_ERR("ctsvc_utils_copy_image() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        ctsvc_end_trans(false);
                        return ret;
                }
 
                free(group->image_thumbnail_path);
                group->image_thumbnail_path = strdup(image);
-               cts_stmt_bind_text(stmt, 7, group->image_thumbnail_path);
+               ctsvc_stmt_bind_text(stmt, 7, group->image_thumbnail_path);
        }
 
        if (group->extra_data)
-               cts_stmt_bind_text(stmt, 8, group->extra_data);
+               ctsvc_stmt_bind_text(stmt, 8, group->extra_data);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
 
        ctsvc_set_group_noti();
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ret = ctsvc_end_trans(true);
        if(ret < CONTACTS_ERROR_NONE ) {
@@ -204,17 +204,17 @@ static int __ctsvc_db_group_update_record( contacts_record_h record )
        snprintf(query, sizeof(query),
                        "SELECT addressbook_id, is_read_only, image_thumbnail_path FROM %s WHERE group_id = %d",
                        CTS_TABLE_GROUPS, group->id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                if (CONTACTS_ERROR_NONE == ret) {
                        CTS_ERR("DB error : The group record(%d) is Invalid(%d)", group->id, ret);
@@ -228,7 +228,7 @@ static int __ctsvc_db_group_update_record( contacts_record_h record )
        is_read_only = ctsvc_stmt_get_int(stmt, 1);
        temp = ctsvc_stmt_get_text(stmt, 2);
        image = SAFE_STRDUP(temp);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        if (is_read_only && ctsvc_record_check_property_flag((ctsvc_record_s *)record, _contacts_group.name, CTSVC_PROPERTY_FLAG_DIRTY)) {
                CTS_ERR("Can not change the group name. It is a read-only group (group_id : %d)", group->id);
@@ -306,10 +306,9 @@ static int __ctsvc_db_group_update_record( contacts_record_h record )
                snprintf(query_set, sizeof(query_set), "%s, changed_ver=%d ", set, ctsvc_get_next_ver());
 
                snprintf(query, sizeof(query), "UPDATE %s SET %s WHERE group_id = %d", CTS_TABLE_GROUPS, query_set, group->id);
-               stmt = cts_query_prepare(query);
+               ret = ctsvc_query_prepare(query, &stmt);
                if (NULL == stmt) {
-                       CTS_ERR("DB error : cts_query_prepare() Failed");
-                       ret = CONTACTS_ERROR_DB;
+                       CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                        break;
                }
                if (bind_text) {
@@ -317,16 +316,16 @@ static int __ctsvc_db_group_update_record( contacts_record_h record )
                        for (cursor=bind_text,i=1;cursor;cursor=cursor->next,i++) {
                                const char *text = cursor->data;
                                if (text && *text)
-                                       cts_stmt_bind_text(stmt, i, text);
+                                       ctsvc_stmt_bind_text(stmt, i, text);
                        }
                }
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        break;
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
 
                ctsvc_set_group_noti();
        } while (0);
@@ -390,7 +389,7 @@ static int __ctsvc_db_group_delete_record( int id )
                return ret;
        }
 
-       ret = cts_db_change();
+       ret = ctsvc_db_change();
        if (ret <= 0) {
                ctsvc_end_trans(false);
                return CONTACTS_ERROR_NO_DATA;
@@ -465,19 +464,22 @@ static int __ctsvc_db_group_get_record( int id, contacts_record_h *out_record )
                                "ringtone_path, vibration, message_alert, image_thumbnail_path "
                                "FROM "CTS_TABLE_GROUPS" WHERE group_id = %d", id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ret = __ctsvc_db_group_value_set(stmt, &record);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("__ctsvc_db_group_value_set(ALL) Failed(%d)", ret);
                return ret;
@@ -506,15 +508,15 @@ static int __ctsvc_db_group_get_all_records( int offset, int limit, contacts_lis
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -522,7 +524,7 @@ static int __ctsvc_db_group_get_all_records( int offset, int limit, contacts_lis
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -549,11 +551,11 @@ static int __ctsvc_db_group_get_records_with_query( contacts_query_h query,
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -623,7 +625,7 @@ static int __ctsvc_db_group_get_records_with_query( contacts_query_h query,
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
index 7e639f8..cf6bb00 100644 (file)
@@ -96,14 +96,14 @@ static int __ctsvc_db_grouprelation_get_all_records( int offset, int limit, cont
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -120,7 +120,7 @@ static int __ctsvc_db_grouprelation_get_all_records( int offset, int limit, cont
                }
        }
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -145,11 +145,11 @@ static int __ctsvc_db_grouprelation_get_records_with_query( contacts_query_h que
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -197,7 +197,7 @@ static int __ctsvc_db_grouprelation_get_records_with_query( contacts_query_h que
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 32c69bf..ed79315 100644 (file)
@@ -138,18 +138,16 @@ static int __ctsvc_db_image_update_contact_image(int contact_id, const char *ima
 
        snprintf(query, sizeof(query), "UPDATE "CTS_TABLE_CONTACTS" SET image_thumbnail_path=? WHERE contact_id = %d", contact_id);
 
-       stmt = cts_query_prepare(query);
-       if( NULL == stmt ) {
-               CTS_ERR( "cts_query_prepare() Failed()");
-               return CONTACTS_ERROR_DB;
-       }
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
+
        if (image_path)
-               cts_stmt_bind_text(stmt, 1, image_path);
+               ctsvc_stmt_bind_text(stmt, 1, image_path);
 
-       ret = cts_stmt_step(stmt);
-       WARN_IF(CONTACTS_ERROR_NONE != ret, "cts_stmt_step() Failed(%d)", ret);
+       ret = ctsvc_stmt_step(stmt);
+       WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_stmt_step() Failed(%d)", ret);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return ret;
 }
@@ -162,19 +160,16 @@ static int __ctsvc_db_image_update_person_image(int person_id, const char *image
 
        snprintf(query, sizeof(query), "UPDATE "CTS_TABLE_PERSONS" SET image_thumbnail_path=? WHERE person_id = %d", person_id);
 
-       stmt = cts_query_prepare(query);
-       if( NULL == stmt ) {
-               CTS_ERR( "cts_query_prepare() Failed()");
-               return CONTACTS_ERROR_DB;
-       }
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (image_path)
-               cts_stmt_bind_text(stmt, 1, image_path);
+               ctsvc_stmt_bind_text(stmt, 1, image_path);
 
-       ret = cts_stmt_step(stmt);
-       WARN_IF(CONTACTS_ERROR_NONE != ret, "cts_stmt_step() Failed(%d)", ret);
+       ret = ctsvc_stmt_step(stmt);
+       WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_stmt_step() Failed(%d)", ret);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return ret;
 }
@@ -202,17 +197,17 @@ static int __ctsvc_db_image_insert_record( contacts_record_h record, int *id )
 
        snprintf(query, sizeof(query),
                        "SELECT addressbook_id, person_id FROM "CTSVC_DB_VIEW_CONTACT" WHERE contact_id = %d", image->contact_id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                if (ret == CONTACTS_ERROR_NONE)
                        return CONTACTS_ERROR_INVALID_PARAMETER;
@@ -222,7 +217,7 @@ static int __ctsvc_db_image_insert_record( contacts_record_h record, int *id )
 
        addressbook_id = ctsvc_stmt_get_int(stmt, 0);
        person_id = ctsvc_stmt_get_int(stmt, 1);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        old_default_image_id = __ctsvc_db_image_get_default_image_id(image->contact_id);
        if (0 == old_default_image_id)
@@ -245,18 +240,15 @@ static int __ctsvc_db_image_insert_record( contacts_record_h record, int *id )
 
        snprintf(query + len, sizeof(query) - len, " WHERE contact_id = %d", image->contact_id);
 
-       stmt = cts_query_prepare(query);
-       if( NULL == stmt ) {
-               CTS_ERR( "cts_query_prepare() Failed()");
-               return CONTACTS_ERROR_DB;
-       }
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (image->is_default)
-               cts_stmt_bind_text(stmt, 1, image->path);
+               ctsvc_stmt_bind_text(stmt, 1, image->path);
 
-       ret = cts_stmt_step(stmt);
-       WARN_IF(CONTACTS_ERROR_NONE != ret, "cts_stmt_step() Failed(%d)", ret);
-       cts_stmt_finalize(stmt);
+       ret = ctsvc_stmt_step(stmt);
+       WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_stmt_step() Failed(%d)", ret);
+       ctsvc_stmt_finalize(stmt);
 
        if (image->is_default) {
                int primary_default_contact_id;
@@ -300,19 +292,22 @@ static int __ctsvc_db_image_get_record( int id, contacts_record_h* out_record )
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_IMAGE);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_image_get_value_from_stmt(stmt, out_record, 0);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -337,23 +332,26 @@ static int __ctsvc_db_image_update_record( contacts_record_h record )
 
        snprintf(query, sizeof(query),
                        "SELECT addressbook_id, person_id FROM "CTSVC_DB_VIEW_CONTACT" WHERE contact_id = %d", image->contact_id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_NO_DATA;
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
        addressbook_id = ctsvc_stmt_get_int(stmt, 0);
        person_id = ctsvc_stmt_get_int(stmt, 1);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ret = ctsvc_db_image_update(record, image->contact_id, false);
        if (CONTACTS_ERROR_NONE != ret) {
@@ -372,18 +370,15 @@ static int __ctsvc_db_image_update_record( contacts_record_h record )
 
        snprintf(query + len, sizeof(query) - len, " WHERE contact_id = %d", image->contact_id);
 
-       stmt = cts_query_prepare(query);
-       if( NULL == stmt ) {
-               CTS_ERR( "cts_query_prepare() Failed()");
-               return CONTACTS_ERROR_DB;
-       }
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (image->is_default)
-               cts_stmt_bind_text(stmt, 1, image->path);
+               ctsvc_stmt_bind_text(stmt, 1, image->path);
 
-       ret = cts_stmt_step(stmt);
-       WARN_IF(CONTACTS_ERROR_NONE != ret, "cts_stmt_step() Failed(%d)", ret);
-       cts_stmt_finalize(stmt);
+       ret = ctsvc_stmt_step(stmt);
+       WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_stmt_step() Failed(%d)", ret);
+       ctsvc_stmt_finalize(stmt);
 
        if (image->is_default) {
                int primary_default_contact_id;
@@ -431,38 +426,41 @@ static int __ctsvc_db_image_delete_record( int id )
        snprintf(query, sizeof(query),
                        "SELECT contact_id, person_id FROM "CTSVC_DB_VIEW_CONTACT " "
                        "WHERE contact_id = (SELECT contact_id FROM "CTS_TABLE_DATA" WHERE id = %d)", id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                CTS_ERR("The id(%d) is Invalid(%d)", id, ret);
-               return ret;
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
        contact_id = ctsvc_stmt_get_int(stmt, 0);
        person_id = ctsvc_stmt_get_int(stmt, 1);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        snprintf(query, sizeof(query),
                        "SELECT is_default, is_primary_default FROM "CTS_TABLE_DATA" WHERE id = %d", id);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                if (CONTACTS_ERROR_NONE == ret)
                        return CONTACTS_ERROR_NO_DATA;
@@ -472,7 +470,7 @@ static int __ctsvc_db_image_delete_record( int id )
 
        is_default = ctsvc_stmt_get_int(stmt, 0);
        is_primary_default = ctsvc_stmt_get_int(stmt, 1);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ret = ctsvc_db_image_delete(id, false);
 
@@ -551,21 +549,21 @@ static int __ctsvc_db_image_get_all_records( int offset, int limit, contacts_lis
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_image_get_value_from_stmt(stmt, (contacts_record_h*)&image, 0);
                ctsvc_list_prepend(list, (contacts_record_h)image);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -590,11 +588,11 @@ static int __ctsvc_db_image_get_records_with_query( contacts_query_h query, int
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -648,7 +646,7 @@ static int __ctsvc_db_image_get_records_with_query( contacts_query_h query, int
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 28f5cd8..b3545ec 100644 (file)
@@ -58,9 +58,9 @@ int ctsvc_db_image_get_value_from_stmt(cts_stmt stmt, contacts_record_h *record,
 static inline int __ctsvc_image_bind_stmt(cts_stmt stmt, ctsvc_image_s *image, int start_cnt)
 {
        if (image->label)
-               cts_stmt_bind_text(stmt, start_cnt, image->label);
+               ctsvc_stmt_bind_text(stmt, start_cnt, image->label);
        if (image->path)
-               cts_stmt_bind_text(stmt, start_cnt+1, image->path);
+               ctsvc_stmt_bind_text(stmt, start_cnt+1, image->path);
        return CONTACTS_ERROR_NONE;
 }
 
@@ -97,7 +97,7 @@ int ctsvc_db_image_insert(contacts_record_h record, int contact_id, bool is_my_p
        ret = ctsvc_have_file_read_permission(image->path);
        RETVM_IF(ret != CONTACTS_ERROR_NONE, ret, "ctsvc_have_file_read_permission fail(%d)", ret);
 
-       image_id = cts_db_get_next_id(CTS_TABLE_DATA);
+       image_id = ctsvc_db_get_next_id(CTS_TABLE_DATA);
        ret = ctsvc_contact_add_image_file(contact_id, image_id, image->path, image_path, sizeof(image_path));
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("ctsvc_contact_add_image_file() Failed(%d)", ret);
@@ -111,22 +111,22 @@ int ctsvc_db_image_insert(contacts_record_h record, int contact_id, bool is_my_p
                        "VALUES(%d, %d, %d, %d, %d, %d, ?, ?)",
                        image_id, contact_id, is_my_profile, CTSVC_DATA_IMAGE, image->is_default, image->type);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        __ctsvc_image_bind_stmt(stmt, image, 1);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("DB error : ctsvc_query_exec() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
-       //image->id = cts_db_get_last_insert_id();
+       //image->id = ctsvc_db_get_last_insert_id();
        if (id)
                *id = image_id;
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        if (ctsvc_record_check_property_flag((ctsvc_record_s *)record, _contacts_image.is_default, CTSVC_PROPERTY_FLAG_DIRTY)) {
                if (image->is_default)
index de10741..44e3fc7 100644 (file)
@@ -129,19 +129,22 @@ static int __ctsvc_db_messenger_get_record( int id, contacts_record_h* out_recor
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_MESSENGER);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_messenger_get_value_from_stmt(stmt, out_record, 0);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -262,21 +265,21 @@ static int __ctsvc_db_messenger_get_all_records( int offset, int limit, contacts
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_messenger_get_value_from_stmt(stmt, (contacts_record_h*)&messenger, 0);
                ctsvc_list_prepend(list, (contacts_record_h)messenger);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -301,11 +304,11 @@ static int __ctsvc_db_messenger_get_records_with_query( contacts_query_h query,
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -355,7 +358,7 @@ static int __ctsvc_db_messenger_get_records_with_query( contacts_query_h query,
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 958bf00..c8018ad 100644 (file)
@@ -67,8 +67,8 @@ int ctsvc_db_messenger_insert(contacts_record_h record, int contact_id, bool is_
                                        "VALUES(%d, %d, %d, %d, ?, ?)",
                        contact_id, is_my_profile, CTSVC_DATA_MESSENGER, messenger->type);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (messenger->label)
                sqlite3_bind_text(stmt, 1, messenger->label,
@@ -77,17 +77,17 @@ int ctsvc_db_messenger_insert(contacts_record_h record, int contact_id, bool is_
                sqlite3_bind_text(stmt, 2, messenger->im_id,
                                strlen(messenger->im_id), SQLITE_STATIC);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
-       //messenger->id = cts_db_get_last_insert_id();
+       //messenger->id = ctsvc_db_get_last_insert_id();
        if (id)
-               *id = cts_db_get_last_insert_id();
-       cts_stmt_finalize(stmt);
+               *id = ctsvc_db_get_last_insert_id();
+       ctsvc_stmt_finalize(stmt);
 
        if (!is_my_profile)
                ctsvc_set_messenger_noti();
index a900f98..a423d09 100644 (file)
@@ -79,14 +79,17 @@ static int __ctsvc_db_get_my_profile_base_info(int id, ctsvc_my_profile_s *my_pr
                                "FROM "CTS_TABLE_MY_PROFILES" WHERE my_profile_id = %d",
                                ctsvc_get_display_column(), id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        i = 0;
@@ -102,7 +105,7 @@ static int __ctsvc_db_get_my_profile_base_info(int id, ctsvc_my_profile_s *my_pr
        }
        temp = ctsvc_stmt_get_text(stmt, i++);
        my_profile->uid = SAFE_STRDUP(temp);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -119,14 +122,14 @@ static int __ctsvc_db_my_profile_get_data(int id, ctsvc_my_profile_s *my_profile
                                        "data3, data4, data5, data6, data7, data8, data9, data10, data11, data12 "
                                        "FROM "CTS_TABLE_DATA" WHERE contact_id = %d AND is_my_profile = 1", id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE */!= ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               return ret;
        }
 
        do {
@@ -179,9 +182,9 @@ static int __ctsvc_db_my_profile_get_data(int id, ctsvc_my_profile_s *my_profile
                        break;
                }
 
-       }while(1 /*CTS_TRUE*/ == cts_stmt_step(stmt));
+       }while(1 /*CTS_TRUE*/ == ctsvc_stmt_step(stmt));
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 
@@ -206,7 +209,7 @@ static int __ctsvc_db_my_profile_get_record( int id, contacts_record_h* out_reco
        }
 
        ret = __ctsvc_db_my_profile_get_data(id, my_profile);
-       if (CONTACTS_ERROR_NONE != ret && CONTACTS_ERROR_NO_DATA != ret) {
+       if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("__ctsvc_db_my_profile_get_data Failed(%d)", ret);
                contacts_record_destroy(record, true);
                return ret;
@@ -753,10 +756,9 @@ static int __ctsvc_db_my_profile_update_record( contacts_record_h record )
 
                snprintf(query, sizeof(query), "UPDATE %s SET %s WHERE my_profile_id = %d", CTS_TABLE_MY_PROFILES, query_set, my_profile->id);
 
-               stmt = cts_query_prepare(query);
+               ret = ctsvc_query_prepare(query, &stmt);
                if (NULL == stmt) {
-                       CTS_ERR("DB error : cts_query_prepare() Failed");
-                       ret = CONTACTS_ERROR_DB;
+                       CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                        break;
                }
 
@@ -765,17 +767,17 @@ static int __ctsvc_db_my_profile_update_record( contacts_record_h record )
                        for (cursor=bind_text,i=1;cursor;cursor=cursor->next,i++) {
                                const char *text = cursor->data;
                                if (*text)
-                                       cts_stmt_bind_text(stmt, i, text);
+                                       ctsvc_stmt_bind_text(stmt, i, text);
                        }
                }
 
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        break;
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
        } while (0);
 
        CTSVC_RECORD_RESET_PROPERTY_FLAGS((ctsvc_record_s *)record);
@@ -812,15 +814,15 @@ static int __ctsvc_db_my_profile_get_all_records( int offset, int limit, contact
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -828,13 +830,13 @@ static int __ctsvc_db_my_profile_get_all_records( int offset, int limit, contact
                ret = contacts_db_get_record(_contacts_my_profile._uri, my_profile_id, &record);
                if (CONTACTS_ERROR_NONE != ret) {
                        CTS_ERR("DB error : contacts_db_get_record() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
-                       return CONTACTS_ERROR_NO_DATA;
+                       return ret;
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -877,19 +879,12 @@ static int __ctsvc_db_my_profile_get_records_with_query( contacts_query_h query,
        ret = ctsvc_db_make_get_records_query_stmt(s_query, offset, limit, &stmt);
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
-       if (CONTACTS_ERROR_NONE == ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
-       }
-
        contacts_list_create(&list);
-       do {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -947,16 +942,16 @@ static int __ctsvc_db_my_profile_get_records_with_query( contacts_query_h query,
                        }
                }
                ret = __ctsvc_db_my_profile_get_data(my_profile_id, my_profile);
-               if (CONTACTS_ERROR_NONE != ret && CONTACTS_ERROR_NO_DATA != ret) {
+               if (CONTACTS_ERROR_NONE != ret) {
                        CTS_ERR("__ctsvc_db_my_profile_get_data Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
 
                ctsvc_list_prepend(list, record);
-       } while ((ret = cts_stmt_step(stmt)));
-       cts_stmt_finalize(stmt);
+       }
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -1126,9 +1121,9 @@ static int __ctsvc_db_my_profile_insert_record( contacts_record_h record, int *i
        ret = ctsvc_query_exec(query);
        WARN_IF(CONTACTS_ERROR_NONE != ret, "Delete deleted my_profile of addressbook(%d) failed", my_profile->addressbook_id);
 
-       ret = cts_db_get_next_id(CTS_TABLE_MY_PROFILES);
+       ret = ctsvc_db_get_next_id(CTS_TABLE_MY_PROFILES);
        if (ret < CONTACTS_ERROR_NONE) {
-               CTS_ERR("cts_db_get_next_id() Failed(%d)", ret);
+               CTS_ERR("ctsvc_db_get_next_id() Failed(%d)", ret);
                ctsvc_end_trans(false);
                return ret;
        }
@@ -1186,30 +1181,30 @@ static int __ctsvc_db_my_profile_insert_record( contacts_record_h record, int *i
                        "VALUES(%d, %d, %d, %d, %d, ?, ?, ?, ?)",
                        my_profile->id, my_profile->addressbook_id, version, version, (int)time(NULL));
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare() Failed");
+               CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        if (my_profile->display_name)
-               cts_stmt_bind_text(stmt, 1, my_profile->display_name);
+               ctsvc_stmt_bind_text(stmt, 1, my_profile->display_name);
        if (my_profile->reverse_display_name)
-               cts_stmt_bind_text(stmt, 2, my_profile->reverse_display_name);
+               ctsvc_stmt_bind_text(stmt, 2, my_profile->reverse_display_name);
        if (my_profile->uid)
-               cts_stmt_bind_text(stmt, 3, my_profile->uid);
+               ctsvc_stmt_bind_text(stmt, 3, my_profile->uid);
        if (my_profile->image_thumbnail_path)
-               cts_stmt_bind_text(stmt, 4, my_profile->image_thumbnail_path);
+               ctsvc_stmt_bind_text(stmt, 4, my_profile->image_thumbnail_path);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ctsvc_set_my_profile_noti();
 
index 0e88316..ed9ef1d 100644 (file)
@@ -141,18 +141,21 @@ static int __ctsvc_db_name_get_record( int id, contacts_record_h* out_record )
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_NAME);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_name_get_value_from_stmt(stmt, out_record, 0);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -282,14 +285,14 @@ static int __ctsvc_db_name_get_all_records( int offset, int limit, contacts_list
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -297,7 +300,7 @@ static int __ctsvc_db_name_get_all_records( int offset, int limit, contacts_list
                ctsvc_list_prepend(list, (contacts_record_h)name);
        }
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -322,11 +325,11 @@ static int __ctsvc_db_name_get_records_with_query( contacts_query_h query, int o
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -397,7 +400,7 @@ static int __ctsvc_db_name_get_records_with_query( contacts_query_h query, int o
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 3e7a766..fc6319b 100644 (file)
@@ -58,8 +58,8 @@ static inline void __ctsvc_make_name_lookup(int op_code, const char *name_first,
 
 static inline int __ctsvc_name_bind_stmt(cts_stmt stmt, ctsvc_name_s *name, int start_cnt)
 {
-       cts_stmt_bind_int(stmt, start_cnt, name->is_default);
-       cts_stmt_bind_int(stmt, start_cnt+1, name->language_type);
+       ctsvc_stmt_bind_int(stmt, start_cnt, name->is_default);
+       ctsvc_stmt_bind_int(stmt, start_cnt+1, name->language_type);
        if (name->first)
                sqlite3_bind_text(stmt, start_cnt+2, name->first,
                                strlen(name->first), SQLITE_STATIC);
@@ -100,13 +100,13 @@ static int __ctsvc_normalize_name(ctsvc_name_s *src, char *dest[])
 
        if (src->first) {
                ret = ctsvc_normalize_str(src->first, &dest[CTSVC_NN_FIRST]);
-               RETVM_IF(ret < CONTACTS_ERROR_NONE, ret, "_cts_normalize_str() Failed(%d)", ret);
+               RETVM_IF(ret < CONTACTS_ERROR_NONE, ret, "ctsvc_normalize_str() Failed(%d)", ret);
                language_type = ret;
        }
 
        if (src->last) {
                ret = ctsvc_normalize_str(src->last, &dest[CTSVC_NN_LAST]);
-               RETVM_IF(ret < CONTACTS_ERROR_NONE, ret, "_cts_normalize_str() Failed(%d)", ret);
+               RETVM_IF(ret < CONTACTS_ERROR_NONE, ret, "ctsvc_normalize_str() Failed(%d)", ret);
                if (language_type < ret)
                        language_type = ret;
        }
@@ -138,13 +138,13 @@ int ctsvc_db_name_insert(contacts_record_h record, int contact_id, bool is_my_pr
                                                "VALUES(%d, %d, %d, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                                contact_id, is_my_profile, CTSVC_DATA_NAME);
 
-               stmt = cts_query_prepare(query);
-               RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
                ret = __ctsvc_normalize_name(name, normal_name);
                if (ret < CONTACTS_ERROR_NONE) {
                        CTS_ERR("__ctsvc_normalize_name() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        return ret;
                }
 
@@ -194,18 +194,18 @@ int ctsvc_db_name_insert(contacts_record_h record, int contact_id, bool is_my_pr
 
                __ctsvc_name_bind_stmt(stmt, name, 1);
 
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
                        CTS_ERR("DB error : ctsvc_query_exec() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       ctsvc_stmt_finalize(stmt);
                        return ret;
                }
 
-               //name->id = cts_db_get_last_insert_id();
+               //name->id = ctsvc_db_get_last_insert_id();
                if (id)
-                       *id = cts_db_get_last_insert_id();
+                       *id = ctsvc_db_get_last_insert_id();
                name->contact_id = contact_id;
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
 
                if (!is_my_profile)
                        ctsvc_set_name_noti();
index ff309bf..69c0736 100644 (file)
@@ -131,19 +131,22 @@ static int __ctsvc_db_nickname_get_record( int id, contacts_record_h* out_record
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_NICKNAME);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_nickname_get_value_from_stmt(stmt, out_record, 0);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -269,21 +272,21 @@ static int __ctsvc_db_nickname_get_all_records( int offset, int limit, contacts_
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_nickname_get_value_from_stmt(stmt, (contacts_record_h*)&nickname, 0);
                ctsvc_list_prepend(list, (contacts_record_h)nickname);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -308,11 +311,11 @@ static int __ctsvc_db_nickname_get_records_with_query( contacts_query_h query, i
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -355,7 +358,7 @@ static int __ctsvc_db_nickname_get_records_with_query( contacts_query_h query, i
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 57fdf92..5ef0a1d 100644 (file)
@@ -66,25 +66,25 @@ int ctsvc_db_nickname_insert(contacts_record_h record, int contact_id, bool is_m
                                                                        "VALUES(%d, %d, %d, %d, ?, ?)",
                        contact_id, is_my_profile, CTSVC_DATA_NICKNAME, nickname->type);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (nickname->label)
-               cts_stmt_bind_text(stmt, 1, nickname->label);
+               ctsvc_stmt_bind_text(stmt, 1, nickname->label);
        if (nickname->nickname)
-               cts_stmt_bind_text(stmt, 2, nickname->nickname);
+               ctsvc_stmt_bind_text(stmt, 2, nickname->nickname);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("DB error : ctsvc_query_exec() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
-       //nickname->id = cts_db_get_last_insert_id();
+       //nickname->id = ctsvc_db_get_last_insert_id();
        if (id)
-               *id = cts_db_get_last_insert_id();
-       cts_stmt_finalize(stmt);
+               *id = ctsvc_db_get_last_insert_id();
+       ctsvc_stmt_finalize(stmt);
 
        if (!is_my_profile)
                ctsvc_set_nickname_noti();
index c5c1f97..41353e6 100644 (file)
@@ -23,7 +23,6 @@
 #include "ctsvc_sqlite.h"
 #include "ctsvc_utils.h"
 #include "ctsvc_db_init.h"
-#include "ctsvc_db_query.h"
 #include "ctsvc_db_plugin_contact_helper.h"
 #include "ctsvc_db_plugin_note_helper.h"
 #include "ctsvc_db_query.h"
@@ -75,18 +74,21 @@ static int __ctsvc_db_note_get_record( int id, contacts_record_h* out_record )
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_NOTE);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_note_get_value_from_stmt(stmt, out_record, 0);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -267,21 +269,21 @@ static int __ctsvc_db_note_get_all_records( int offset, int limit, contacts_list
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_note_get_value_from_stmt(stmt, (contacts_record_h*)&note, 0);
                ctsvc_list_prepend(list, (contacts_record_h)note);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -306,11 +308,11 @@ static int __ctsvc_db_note_get_records_with_query( contacts_query_h query, int o
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -353,7 +355,7 @@ static int __ctsvc_db_note_get_records_with_query( contacts_query_h query, int o
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index df3de40..d82b45e 100644 (file)
@@ -66,21 +66,21 @@ int ctsvc_db_note_insert(contacts_record_h record, int contact_id, bool is_my_pr
                "INSERT INTO "CTS_TABLE_DATA"(contact_id, is_my_profile, datatype, data3) "
                                        "VALUES(%d, %d, %d, ?)", contact_id, is_my_profile, CTSVC_DATA_NOTE);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        sqlite3_bind_text(stmt, 1, note->note,
                        strlen(note->note), SQLITE_STATIC);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
        if (id)
-               *id = cts_db_get_last_insert_id();
-       cts_stmt_finalize(stmt);
+               *id = ctsvc_db_get_last_insert_id();
+       ctsvc_stmt_finalize(stmt);
 
        if (!is_my_profile)
                ctsvc_set_note_noti();
index c8296b6..cfc657a 100644 (file)
@@ -196,17 +196,17 @@ static int __ctsvc_db_number_insert_record( contacts_record_h record, int *id )
 
        snprintf(query, sizeof(query),
                        "SELECT addressbook_id, person_id FROM "CTSVC_DB_VIEW_CONTACT" WHERE contact_id = %d", number->contact_id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                if (CONTACTS_ERROR_NO_DATA)
                        return CONTACTS_ERROR_INVALID_PARAMETER;
@@ -215,7 +215,7 @@ static int __ctsvc_db_number_insert_record( contacts_record_h record, int *id )
        }
        addressbook_id = ctsvc_stmt_get_int(stmt, 0);
        person_id = ctsvc_stmt_get_int(stmt, 1);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        old_default_number_id = __ctsvc_db_number_get_default_number_id(number->contact_id);
        if (0 == old_default_number_id)
@@ -276,18 +276,21 @@ static int __ctsvc_db_number_get_record( int id, contacts_record_h* out_record )
                "SELECT id, contact_id, is_default, data1, data2, data3, data4 "
                                "FROM "CTSVC_DB_VIEW_NUMBER" WHERE id = %d", id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_number_get_value_from_stmt(stmt, out_record, 0);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -373,17 +376,17 @@ static int __ctsvc_db_number_delete_record( int id )
                        "SELECT contact_id, person_id FROM "CTSVC_DB_VIEW_CONTACT " "
                        "WHERE contact_id = (SELECT contact_id FROM "CTS_TABLE_DATA" WHERE id = %d)", id);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                if (CONTACTS_ERROR_NONE == ret)
                        return CONTACTS_ERROR_NO_DATA;
@@ -393,23 +396,26 @@ static int __ctsvc_db_number_delete_record( int id )
 
        contact_id = ctsvc_stmt_get_int(stmt, 0);
        person_id = ctsvc_stmt_get_int(stmt, 1);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        snprintf(query, sizeof(query),
                        "SELECT is_default, is_primary_default FROM "CTS_TABLE_DATA" WHERE id = %d", id);
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_NO_DATA;
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
        is_default = ctsvc_stmt_get_int(stmt, 0);
        is_primary_default = ctsvc_stmt_get_int(stmt, 1);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ret = ctsvc_db_number_delete(id, false);
 
@@ -478,21 +484,21 @@ static int __ctsvc_db_number_get_all_records( int offset, int limit, contacts_li
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step Failed (%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step Failed (%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_number_get_value_from_stmt(stmt, (contacts_record_h*)&number, 0);
                ctsvc_list_prepend(list, (contacts_record_h)number);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -517,11 +523,11 @@ static int __ctsvc_db_number_get_records_with_query( contacts_query_h query, int
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -578,7 +584,7 @@ static int __ctsvc_db_number_get_records_with_query( contacts_query_h query, int
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index a77e86d..cd76dab 100644 (file)
@@ -50,32 +50,32 @@ int ctsvc_db_number_insert(contacts_record_h record, int contact_id, bool is_my_
                                                                        "VALUES(%d, %d, %d, %d, %d, ?, ?, ?, ?)",
                        contact_id, is_my_profile, CTSVC_DATA_NUMBER, number->is_default, number->type);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (number->label)
-               cts_stmt_bind_text(stmt, 1, number->label);
+               ctsvc_stmt_bind_text(stmt, 1, number->label);
 
-       cts_stmt_bind_text(stmt, 2, number->number);
+       ctsvc_stmt_bind_text(stmt, 2, number->number);
        ret = ctsvc_normalize_number(number->number, normal_num, sizeof(normal_num));
        if (0 < ret) {
-               cts_stmt_bind_text(stmt, 4, normal_num);
+               ctsvc_stmt_bind_text(stmt, 4, normal_num);
                ret = ctsvc_get_minmatch_number(normal_num, minmatch, CTSVC_NUMBER_MAX_LEN, ctsvc_get_phonenumber_min_match_digit());
                if (CONTACTS_ERROR_NONE == ret)
-                       cts_stmt_bind_text(stmt, 3, minmatch);
+                       ctsvc_stmt_bind_text(stmt, 3, minmatch);
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("DB error : ctsvc_query_exec() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
-       //number->id = cts_db_get_last_insert_id();
+       //number->id = ctsvc_db_get_last_insert_id();
        if (id)
-               *id = cts_db_get_last_insert_id();
-       cts_stmt_finalize(stmt);
+               *id = ctsvc_db_get_last_insert_id();
+       ctsvc_stmt_finalize(stmt);
 
        if (!is_my_profile)
                ctsvc_set_number_noti();
index da1cafe..2b950a8 100644 (file)
@@ -96,17 +96,20 @@ static int __ctsvc_db_person_get_record( int id, contacts_record_h* out_record )
                        "WHERE persons.person_id = %d",
                        ctsvc_get_display_column(), ctsvc_get_sort_name_column(), id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if( 1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
        ret = ctsvc_db_person_create_record_from_stmt(stmt, &record);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        if(CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("ctsvc_db_person_create_record_from_stmt() Failed(%d)", ret);
@@ -153,25 +156,25 @@ static int __ctsvc_db_person_update_record( contacts_record_h record )
                snprintf(check_query, sizeof(check_query), "SELECT contact_id, %s FROM "CTS_TABLE_CONTACTS
                                " WHERE person_id = %d AND contact_id = %d AND deleted = 0",
                                ctsvc_get_display_column(), person->person_id, person->name_contact_id);
-               stmt = cts_query_prepare(check_query);
+               ret = ctsvc_query_prepare(check_query, &stmt);
                if (NULL == stmt) {
-                       CTS_ERR("cts_query_prepare() Failed");
+                       CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                        ctsvc_end_trans(false);
-                       return CONTACTS_ERROR_DB;
+                       return ret;
                }
 
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if ( 1 != ret) {
                        if ( CONTACTS_ERROR_NONE == ret) {
                                CTS_ERR("Invalid parameter : the name_contact_id(%d) is not linked with person_id(%d)",
                                        person->name_contact_id, person->person_id);
-                               cts_stmt_finalize(stmt);
+                               ctsvc_stmt_finalize(stmt);
                                ctsvc_end_trans(false);
                                return CONTACTS_ERROR_INVALID_PARAMETER;
                        }
                        else {
-                               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                               cts_stmt_finalize(stmt);
+                               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                               ctsvc_stmt_finalize(stmt);
                                ctsvc_end_trans(false);
                                return ret;
                        }
@@ -179,7 +182,7 @@ static int __ctsvc_db_person_update_record( contacts_record_h record )
                temp = ctsvc_stmt_get_text(stmt, 0);
                display_name = SAFE_STRDUP(temp);
 
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
        }
 
        // update favorite
@@ -188,7 +191,7 @@ static int __ctsvc_db_person_update_record( contacts_record_h record )
                        CTSVC_PROPERTY_FLAG_DIRTY == person->base.properties_flags[index_favorite]) {
                ret = ctsvc_db_person_set_favorite(person->person_id, person->is_favorite, true);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
+                       CTS_ERR("ctsvc_db_person_set_favorite() Failed(%d)", ret);
                        ctsvc_end_trans(false);
                        return ret;
                }
@@ -209,10 +212,9 @@ static int __ctsvc_db_person_update_record( contacts_record_h record )
 
                snprintf(query, sizeof(query), "UPDATE %s SET %s WHERE person_id = %d", CTS_TABLE_PERSONS, query_set, person->person_id);
 
-               stmt = cts_query_prepare(query);
+               ret = ctsvc_query_prepare(query, &stmt);
                if (NULL == stmt) {
-                       CTS_ERR("DB error : cts_query_prepare() Failed");
-                       ret = CONTACTS_ERROR_DB;
+                       CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                        break;
                }
 
@@ -221,16 +223,16 @@ static int __ctsvc_db_person_update_record( contacts_record_h record )
                        for (cursor=bind_text,i=1;cursor;cursor=cursor->next,i++) {
                                const char *text = cursor->data;
                                if (text && *text)
-                                       cts_stmt_bind_text(stmt, i, text);
+                                       ctsvc_stmt_bind_text(stmt, i, text);
                        }
                }
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        break;
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
        } while (0);
 
        if (CONTACTS_ERROR_NONE != ret) {
@@ -254,9 +256,9 @@ static int __ctsvc_db_person_update_record( contacts_record_h record )
                len += snprintf(contact_query + len, sizeof(contact_query) - len, ", message_alert=? ");
        snprintf(contact_query+len, sizeof(contact_query)-len, " WHERE person_id=%d AND deleted = 0", person->person_id);
 
-       stmt = cts_query_prepare(contact_query);
+       ret = ctsvc_query_prepare(contact_query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare() Failed");
+               CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
                CTSVC_RECORD_RESET_PROPERTY_FLAGS((ctsvc_record_s *)record);
                CONTACTS_FREE(set);
@@ -265,30 +267,30 @@ static int __ctsvc_db_person_update_record( contacts_record_h record )
                                CONTACTS_FREE(cursor->data);
                        g_slist_free(bind_text);
                }
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        i = 1;
        if (ctsvc_record_check_property_flag((ctsvc_record_s *)person, _contacts_person.ringtone_path, CTSVC_PROPERTY_FLAG_DIRTY)) {
                if (person->ringtone_path)
-                       cts_stmt_bind_text(stmt, i, person->ringtone_path);
+                       ctsvc_stmt_bind_text(stmt, i, person->ringtone_path);
                i++;
        }
        if (ctsvc_record_check_property_flag((ctsvc_record_s *)person, _contacts_person.vibration, CTSVC_PROPERTY_FLAG_DIRTY)) {
                if (person->vibration)
-                       cts_stmt_bind_text(stmt, i, person->vibration);
+                       ctsvc_stmt_bind_text(stmt, i, person->vibration);
                i++;
        }
        if (ctsvc_record_check_property_flag((ctsvc_record_s *)person, _contacts_person.message_alert, CTSVC_PROPERTY_FLAG_DIRTY)) {
                if (person->message_alert)
-                       cts_stmt_bind_text(stmt, i, person->message_alert);
+                       ctsvc_stmt_bind_text(stmt, i, person->message_alert);
                i++;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                CTSVC_RECORD_RESET_PROPERTY_FLAGS((ctsvc_record_s *)record);
                CONTACTS_FREE(set);
@@ -299,7 +301,7 @@ static int __ctsvc_db_person_update_record( contacts_record_h record )
                }
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        CTSVC_RECORD_RESET_PROPERTY_FLAGS((ctsvc_record_s *)record);
        CONTACTS_FREE(set);
@@ -365,11 +367,11 @@ static int __ctsvc_db_person_delete_record( int id )
                return ret;
        }
 
-       rel_changed = cts_db_change();
+       rel_changed = ctsvc_db_change();
 
        // images are deleted by db trigger callback function in ctsvc_db_contact_delete_callback
        snprintf(query, sizeof(query),
-                       "UPDATE "CTS_TABLE_CONTACTS" SET deleted = 1, person_id = 0, changed_ver=%d WHERE person_id = %d",
+                       "UPDATE "CTS_TABLE_CONTACTS" SET deleted = 1, person_id = 0, changed_ver = %d WHERE person_id = %d",
                        version, id);
        ret = ctsvc_query_exec(query);
        if (CONTACTS_ERROR_NONE != ret) {
@@ -432,29 +434,29 @@ static int __ctsvc_db_person_get_all_records( int offset, int limit, contacts_li
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ret = ctsvc_db_person_create_record_from_stmt(stmt, &record);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_db_person_create_record_from_stmt() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -479,11 +481,11 @@ static int __ctsvc_db_person_get_records_with_query( contacts_query_h query, int
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -570,7 +572,7 @@ static int __ctsvc_db_person_get_records_with_query( contacts_query_h query, int
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 1315854..20433f1 100755 (executable)
@@ -190,7 +190,7 @@ int ctsvc_db_person_create_record_from_stmt(cts_stmt stmt, contacts_record_h *re
        return CONTACTS_ERROR_NONE;
 }
 
-inline static const char* __cts_get_image_filename(const char* src)
+inline static const char* __ctsvc_get_image_filename(const char* src)
 {
        const char* dir = CTS_IMG_FULL_LOCATION;
        int pos=0;
@@ -215,19 +215,19 @@ int ctsvc_db_person_set_favorite(int person_id, bool set, bool propagate)
                snprintf(query, sizeof(query),
                        "SELECT MAX(favorite_prio) FROM "CTS_TABLE_FAVORITES);
 
-               stmt = cts_query_prepare(query);
-               RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "cts_query_prepare() Failed");
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (1 /*CTS_TRUE*/ == ret) {
                        prio = ctsvc_stmt_get_dbl(stmt, 0);
                }
                else if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        return ret;
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
 
                prio = prio + 1.0;
                snprintf(query, sizeof(query),
@@ -272,15 +272,12 @@ int ctsvc_db_insert_person(contacts_record_h record)
                "WHERE contact_id=%d "
                "ORDER BY timestamp DESC LIMIT 1",
                CTS_TABLE_ACTIVITIES, contact->id);
-       stmt = cts_query_prepare(query);
-       if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed()");
-               return CONTACTS_ERROR_DB;
-       }
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       if (1 == cts_stmt_step(stmt))
+       if (1 == ctsvc_stmt_step(stmt))
                status = SAFE_STRDUP(ctsvc_stmt_get_text(stmt, 0));
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        version = ctsvc_get_next_ver();
        snprintf(query, sizeof(query),
@@ -291,33 +288,33 @@ int ctsvc_db_insert_person(contacts_record_h record)
                        contact->id, version, version,
                        contact->has_phonenumber, contact->has_email, contact->addressbook_id);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed()");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                free(status);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
        if(contact->ringtone_path)
-               cts_stmt_bind_text(stmt, 1, contact->ringtone_path);
+               ctsvc_stmt_bind_text(stmt, 1, contact->ringtone_path);
        if(contact->vibration)
-               cts_stmt_bind_text(stmt, 2, contact->vibration);
+               ctsvc_stmt_bind_text(stmt, 2, contact->vibration);
        if(contact->message_alert)
-               cts_stmt_bind_text(stmt, 3, contact->message_alert);
+               ctsvc_stmt_bind_text(stmt, 3, contact->message_alert);
        if(status)
-               cts_stmt_bind_text(stmt, 4, status);
+               ctsvc_stmt_bind_text(stmt, 4, status);
        if(contact->image_thumbnail_path)
-               cts_stmt_bind_text(stmt, 5, __cts_get_image_filename(contact->image_thumbnail_path));
+               ctsvc_stmt_bind_text(stmt, 5, __ctsvc_get_image_filename(contact->image_thumbnail_path));
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                free(status);
                return ret;
        }
-       index = cts_db_get_last_insert_id();
+       index = ctsvc_db_get_last_insert_id();
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        snprintf(query, sizeof(query),
                "UPDATE "CTS_TABLE_DATA" SET is_primary_default = 1 "
@@ -334,7 +331,7 @@ int ctsvc_db_insert_person(contacts_record_h record)
        if (contact->is_favorite) {
                ret = ctsvc_db_person_set_favorite(index, contact->is_favorite, false);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
+                       CTS_ERR("ctsvc_db_person_set_favorite() Failed(%d)", ret);
                        return ret;
                }
        }
@@ -370,13 +367,11 @@ static inline int __ctsvc_db_update_person_default(int person_id, int datatype)
                        "WHERE C.person_id=%d AND D.datatype=%d AND D.is_default=1 AND D.is_my_profile = 0 ORDER BY D.id",
                        person_id, datatype);
 
-               stmt = cts_query_prepare(query);
-               if (NULL == stmt) {
-                       CTS_ERR("cts_query_prepare() Failed");
-                       return CONTACTS_ERROR_DB;
-               }
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-               if ((ret = cts_stmt_step(stmt))) {
+               ret = ctsvc_stmt_step(stmt);
+               if (1 == ret) {
                        data_id = ctsvc_stmt_get_int(stmt, 0);
 
                        snprintf(query, sizeof(query),
@@ -386,22 +381,27 @@ static inline int __ctsvc_db_update_person_default(int person_id, int datatype)
                        ret = ctsvc_query_exec(query);
                        if (CONTACTS_ERROR_NONE != ret) {
                                CTS_ERR("cts_query_exec Failed(%d)", ret);
-                               cts_stmt_finalize(stmt);
+                               ctsvc_stmt_finalize(stmt);
                                return ret;
                        }
                        temp = ctsvc_stmt_get_text(stmt, 1);
                        image_thumbnail_path = SAFE_STRDUP(temp);
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
 
                if (CTSVC_DATA_IMAGE == datatype) {
                        if (image_thumbnail_path) {
                                snprintf(query, sizeof(query),
                                                "UPDATE "CTS_TABLE_PERSONS" SET image_thumbnail_path=? WHERE person_id=%d", person_id);
-                               stmt = cts_query_prepare(query);
-                               cts_stmt_bind_text(stmt, 1, image_thumbnail_path);
-                               ret = cts_stmt_step(stmt);
-                               cts_stmt_finalize(stmt);
+                               ret = ctsvc_query_prepare(query, &stmt);
+                               if (NULL == stmt) {
+                                       free(image_thumbnail_path);
+                                       CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
+                                       return ret;
+                               }
+                               ctsvc_stmt_bind_text(stmt, 1, image_thumbnail_path);
+                               ret = ctsvc_stmt_step(stmt);
+                               ctsvc_stmt_finalize(stmt);
                                free(image_thumbnail_path);
                                if (CONTACTS_ERROR_NONE != ret) {
                                        CTS_ERR("cts_query_exec Failed(%d)", ret);
@@ -491,43 +491,43 @@ int ctsvc_db_update_person(contacts_record_h record)
        snprintf(query+len, sizeof(query)-len,
                        " WHERE person_id=%d", contact->person_id);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare() Failed");
+               CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        if (ctsvc_record_check_property_flag((ctsvc_record_s *)record, _contacts_contact.ringtone_path, CTSVC_PROPERTY_FLAG_DIRTY)) {
                if (contact->ringtone_path)
-                       cts_stmt_bind_text(stmt, i, contact->ringtone_path);
+                       ctsvc_stmt_bind_text(stmt, i, contact->ringtone_path);
                i++;
        }
        if (ctsvc_record_check_property_flag((ctsvc_record_s *)record, _contacts_contact.vibration, CTSVC_PROPERTY_FLAG_DIRTY)) {
                if (contact->vibration)
-                       cts_stmt_bind_text(stmt, i, contact->vibration);
+                       ctsvc_stmt_bind_text(stmt, i, contact->vibration);
                i++;
        }
        if (ctsvc_record_check_property_flag((ctsvc_record_s *)record, _contacts_contact.message_alert, CTSVC_PROPERTY_FLAG_DIRTY)) {
                if (contact->message_alert)
-                       cts_stmt_bind_text(stmt, i, contact->message_alert);
+                       ctsvc_stmt_bind_text(stmt, i, contact->message_alert);
                i++;
        }
        if (ctsvc_record_check_property_flag((ctsvc_record_s *)record, _contacts_contact.image_thumbnail_path, CTSVC_PROPERTY_FLAG_DIRTY) &&
                        (contact->id == thumbnail_contact_id || thumbnail_contact_id == -1)) {
                if (contact->image_thumbnail_path)
-                       cts_stmt_bind_text(stmt, i, contact->image_thumbnail_path);
+                       ctsvc_stmt_bind_text(stmt, i, contact->image_thumbnail_path);
                i++;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        // update favorite
        snprintf(query, sizeof(query),
index d8ed7d5..faa9e71 100644 (file)
@@ -104,19 +104,22 @@ static int __ctsvc_db_phonelog_get_record( int id, contacts_record_h* out_record
                        "SELECT id, number, person_id, log_type, log_time, data1, data2 "
                        "FROM "CTS_TABLE_PHONELOGS" WHERE id = %d", id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ret = __ctsvc_db_phonelog_value_set(stmt, &record);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("__ctsvc_db_phonelog_value_set(ALL) Failed(%d)", ret);
                return ret;
@@ -161,7 +164,7 @@ static int __ctsvc_db_phonelog_update_record( contacts_record_h record )
                if (CONTACTS_ERROR_NONE != (ret = ctsvc_db_create_set_query(record, &set, &bind_text))) break;
                if (CONTACTS_ERROR_NONE != (ret = ctsvc_db_update_record_with_set_query(set, bind_text, CTS_TABLE_PHONELOGS, phonelog->id))) break;
 
-               if (cts_db_change()) {
+               if (ctsvc_db_change()) {
                        ctsvc_set_phonelog_noti();
 
 #ifdef _CONTACTS_IPC_SERVER
@@ -213,6 +216,7 @@ static int __ctsvc_db_phonelog_delete_record( int id )
        }
 
        ctsvc_set_phonelog_noti();
+
        ret = ctsvc_end_trans(true);
        if (ret < CONTACTS_ERROR_NONE)
        {
@@ -241,23 +245,23 @@ static int __ctsvc_db_phonelog_get_all_records( int offset, int limit,
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
-                       return CONTACTS_ERROR_NO_DATA;
+                       return ret;
                }
                __ctsvc_db_phonelog_value_set(stmt, &record);
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -282,11 +286,11 @@ static int __ctsvc_db_phonelog_get_records_with_query( contacts_query_h query, i
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -331,11 +335,11 @@ static int __ctsvc_db_phonelog_get_records_with_query( contacts_query_h query, i
                                phonelog->log_type = ctsvc_stmt_get_int(stmt, i);
                                break;
                        case CTSVC_PROPERTY_PHONELOG_EXTRA_DATA1:
-                               phonelog->extra_data1= ctsvc_stmt_get_int(stmt, i);
+                               phonelog->extra_data1 = ctsvc_stmt_get_int(stmt, i);
                                break;
                        case CTSVC_PROPERTY_PHONELOG_EXTRA_DATA2:
                                temp = ctsvc_stmt_get_text(stmt, i);
-                               phonelog->extra_data2= SAFE_STRDUP(temp);
+                               phonelog->extra_data2 = SAFE_STRDUP(temp);
                                break;
                        default:
                                break;
@@ -344,7 +348,7 @@ static int __ctsvc_db_phonelog_get_records_with_query( contacts_query_h query, i
                ctsvc_list_prepend(list, record);
        }
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -388,7 +392,7 @@ static int __ctsvc_db_phonelog_increase_outgoing_count(ctsvc_phonelog_s *phonelo
        }
 
        ret = ctsvc_query_exec(query);
-       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : cts_query_exec() Failed(%d)", ret);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_query_exec() Failed(%d)", ret);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -410,36 +414,36 @@ static int  __ctsvc_db_phonelog_insert(ctsvc_phonelog_s *phonelog, int *id)
                        "VALUES(?, ?, ?, ?, %d, %d, %d, ?)",
                        phonelog->log_type, phonelog->log_time, phonelog->extra_data1);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (phonelog->address) {
-               cts_stmt_bind_text(stmt, 1, phonelog->address);
+               ctsvc_stmt_bind_text(stmt, 1, phonelog->address);
                if (phonelog->log_type < CONTACTS_PLOG_TYPE_EMAIL_RECEIVED) {
                        ret = ctsvc_normalize_number(phonelog->address, normal_num, sizeof(normal_num));
-                       cts_stmt_bind_text(stmt, 2, normal_num);
+                       ctsvc_stmt_bind_text(stmt, 2, normal_num);
                        if (0 < ret) {
                                ret = ctsvc_get_minmatch_number(normal_num, minmatch, CTSVC_NUMBER_MAX_LEN, ctsvc_get_phonenumber_min_match_digit());
-                               cts_stmt_bind_text(stmt, 3, minmatch);
+                               ctsvc_stmt_bind_text(stmt, 3, minmatch);
                        }
                }
        }
 
        if (0 < phonelog->person_id)
-               cts_stmt_bind_int(stmt, 4, phonelog->person_id);
+               ctsvc_stmt_bind_int(stmt, 4, phonelog->person_id);
 
        if (phonelog->extra_data2)
-               cts_stmt_bind_text(stmt, 5, phonelog->extra_data2);
+               ctsvc_stmt_bind_text(stmt, 5, phonelog->extra_data2);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
        if (id)
-               *id = cts_db_get_last_insert_id();
-       cts_stmt_finalize(stmt);
+               *id = ctsvc_db_get_last_insert_id();
+       ctsvc_stmt_finalize(stmt);
 
        ctsvc_set_phonelog_noti();
        return CONTACTS_ERROR_NONE;
index 9169a19..e3e113c 100644 (file)
@@ -131,19 +131,22 @@ static int __ctsvc_db_profile_get_record( int id, contacts_record_h* out_record
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_PROFILE);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_profile_get_value_from_stmt(stmt, out_record, 0);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -265,21 +268,21 @@ static int __ctsvc_db_profile_get_all_records( int offset, int limit, contacts_l
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_profile_get_value_from_stmt(stmt, (contacts_record_h*)&profile, 0);
                ctsvc_list_prepend(list, (contacts_record_h)profile);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -304,11 +307,11 @@ static int __ctsvc_db_profile_get_records_with_query( contacts_query_h query, in
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -382,7 +385,7 @@ static int __ctsvc_db_profile_get_records_with_query( contacts_query_h query, in
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 4207232..72bfa94 100644 (file)
@@ -67,22 +67,22 @@ int ctsvc_db_profile_get_value_from_stmt(cts_stmt stmt, contacts_record_h *recor
 static inline int __ctsvc_profile_bind_stmt(cts_stmt stmt, ctsvc_profile_s *profile, int start_cnt)
 {
        if (profile->uid)
-               cts_stmt_bind_text(stmt, start_cnt, profile->uid);
+               ctsvc_stmt_bind_text(stmt, start_cnt, profile->uid);
        if (profile->text)
-               cts_stmt_bind_text(stmt, start_cnt+1, profile->text);
-       cts_stmt_bind_int(stmt, start_cnt+2, profile->order);
+               ctsvc_stmt_bind_text(stmt, start_cnt+1, profile->text);
+       ctsvc_stmt_bind_int(stmt, start_cnt+2, profile->order);
        if (profile->service_operation)
-               cts_stmt_bind_text(stmt, start_cnt+3, profile->service_operation);
+               ctsvc_stmt_bind_text(stmt, start_cnt+3, profile->service_operation);
        if (profile->mime)
-               cts_stmt_bind_text(stmt, start_cnt+4, profile->mime);
+               ctsvc_stmt_bind_text(stmt, start_cnt+4, profile->mime);
        if (profile->app_id)
-               cts_stmt_bind_text(stmt, start_cnt+5, profile->app_id);
+               ctsvc_stmt_bind_text(stmt, start_cnt+5, profile->app_id);
        if (profile->uri)
-               cts_stmt_bind_text(stmt, start_cnt+6, profile->uri);
+               ctsvc_stmt_bind_text(stmt, start_cnt+6, profile->uri);
        if (profile->category)
-               cts_stmt_bind_text(stmt, start_cnt+7, profile->category);
+               ctsvc_stmt_bind_text(stmt, start_cnt+7, profile->category);
        if (profile->extra_data)
-               cts_stmt_bind_text(stmt, start_cnt+8, profile->extra_data);
+               ctsvc_stmt_bind_text(stmt, start_cnt+8, profile->extra_data);
        return CONTACTS_ERROR_NONE;
 }
 
@@ -105,22 +105,22 @@ int ctsvc_db_profile_insert(contacts_record_h record, int contact_id, bool is_my
                                "VALUES(%d, %d, %d, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                                contact_id, is_my_profile, CTSVC_DATA_PROFILE);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        __ctsvc_profile_bind_stmt(stmt, profile, 1);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("DB error : ctsvc_query_exec() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
-       //profile->id = cts_db_get_last_insert_id();
+       //profile->id = ctsvc_db_get_last_insert_id();
        if (id)
-               *id = cts_db_get_last_insert_id();
-       cts_stmt_finalize(stmt);
+               *id = ctsvc_db_get_last_insert_id();
+       ctsvc_stmt_finalize(stmt);
 
        if (!is_my_profile)
                ctsvc_set_profile_noti();
index ec9c4db..864145a 100644 (file)
@@ -131,19 +131,22 @@ static int __ctsvc_db_relationship_get_record( int id, contacts_record_h* out_re
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_RELATIONSHIP);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_relationship_get_value_from_stmt(stmt, out_record, 0);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -264,21 +267,21 @@ static int __ctsvc_db_relationship_get_all_records( int offset, int limit, conta
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_relationship_get_value_from_stmt(stmt, (contacts_record_h*)&relationship, 0);
                ctsvc_list_prepend(list, (contacts_record_h)relationship);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -303,11 +306,11 @@ static int __ctsvc_db_relationship_get_records_with_query( contacts_query_h quer
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -357,7 +360,7 @@ static int __ctsvc_db_relationship_get_records_with_query( contacts_query_h quer
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index a790b81..55f1db0 100644 (file)
@@ -53,9 +53,9 @@ int ctsvc_db_relationship_get_value_from_stmt(cts_stmt stmt, contacts_record_h *
 static inline int __ctsvc_relationship_bind_stmt(cts_stmt stmt, ctsvc_relationship_s *relationship, int start_cnt)
 {
        if (relationship->label)
-               cts_stmt_bind_text(stmt, start_cnt, relationship->label);
+               ctsvc_stmt_bind_text(stmt, start_cnt, relationship->label);
        if (relationship->name)
-               cts_stmt_bind_text(stmt, 2, relationship->name);
+               ctsvc_stmt_bind_text(stmt, 2, relationship->name);
        return CONTACTS_ERROR_NONE;
 }
 
@@ -78,22 +78,22 @@ int ctsvc_db_relationship_insert(contacts_record_h record, int contact_id, bool
                                                                        "VALUES(%d, %d, %d, %d, ?, ?)",
                                        contact_id, is_my_profile, CTSVC_DATA_RELATIONSHIP, relationship->type);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        __ctsvc_relationship_bind_stmt(stmt, relationship, 1);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("DB error : ctsvc_query_exec() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
-       //relationship->id = cts_db_get_last_insert_id();
+       //relationship->id = ctsvc_db_get_last_insert_id();
        if (id)
-               *id = cts_db_get_last_insert_id();
-       cts_stmt_finalize(stmt);
+               *id = ctsvc_db_get_last_insert_id();
+       ctsvc_stmt_finalize(stmt);
 
        if (!is_my_profile)
                ctsvc_set_relationship_noti();
index 1629ed1..0a46bdb 100644 (file)
@@ -91,19 +91,22 @@ static int __ctsvc_db_sdn_get_record( int id, contacts_record_h* out_record )
        len = snprintf(query, sizeof(query),
                                "SELECT id, name, number FROM "CTS_TABLE_SDN" WHERE id = %d", id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ret = __ctsvc_db_sdn_value_set(stmt, &record);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("__ctsvc_db_sdn_value_set(ALL) Failed(%d)", ret);
                return ret;
@@ -131,34 +134,31 @@ static int __ctsvc_db_sdn_insert_record( contacts_record_h record, int *id )
        snprintf(query, sizeof(query),
                        "INSERT INTO "CTS_TABLE_SDN"(name, number) VALUES(?, ?)");
 
-       stmt = cts_query_prepare(query);
-       if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
-               return CONTACTS_ERROR_DB;
-       }
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       cts_stmt_bind_text(stmt, 1, sdn->name);
-       cts_stmt_bind_text(stmt, 2, sdn->number);
+       ctsvc_stmt_bind_text(stmt, 1, sdn->name);
+       ctsvc_stmt_bind_text(stmt, 2, sdn->number);
 
        ret = ctsvc_begin_trans();
        if( ret < CONTACTS_ERROR_NONE ) {
                CTS_ERR("DB error : ctsvc_begin_trans() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
 
-       //sdn->id = cts_db_get_last_insert_id();
+       //sdn->id = ctsvc_db_get_last_insert_id();
        if (id)
-               *id = cts_db_get_last_insert_id();
-       cts_stmt_finalize(stmt);
+               *id = ctsvc_db_get_last_insert_id();
+       ctsvc_stmt_finalize(stmt);
 
        ctsvc_set_sdn_noti();
        ret = ctsvc_end_trans(true);
@@ -245,7 +245,7 @@ static int __ctsvc_db_sdn_delete_record( int sdn_id )
                return ret;
        }
 
-       ret = cts_db_change();
+       ret = ctsvc_db_change();
        if (ret <= 0) {
                ret = CONTACTS_ERROR_NO_DATA;
                ctsvc_end_trans(false);
@@ -280,23 +280,23 @@ static int __ctsvc_db_sdn_get_all_records( int offset, int limit,
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
-                       return CONTACTS_ERROR_NO_DATA;
+                       return ret;
                }
                __ctsvc_db_sdn_value_set(stmt, &record);
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -320,13 +320,13 @@ static int __ctsvc_db_sdn_get_records_with_query( contacts_query_h query, int of
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
-                       return CONTACTS_ERROR_NO_DATA;
+                       return ret;
                }
 
                contacts_record_create(_contacts_sdn._uri, &record);
@@ -369,7 +369,7 @@ static int __ctsvc_db_sdn_get_records_with_query( contacts_query_h query, int of
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
index 4c1fa04..2066524 100644 (file)
@@ -117,19 +117,22 @@ static int __ctsvc_db_simple_contact_get_record( int id, contacts_record_h* out_
                                        "FROM "CTS_TABLE_CONTACTS" WHERE contact_id = %d AND deleted = 0",
                                        ctsvc_get_display_column(), id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ret = __ctsvc_db_simple_contact_value_set(stmt, &record);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("__ctsvc_db_simple_contact_value_set(ALL) Failed(%d)", ret);
                return ret;
@@ -206,7 +209,7 @@ static int __ctsvc_db_simple_contact_update_record( contacts_record_h record )
                img_id = __ctsvc_db_simple_contact_get_default_image_id(contact->contact_id);
 
                if (0 == img_id) {
-                       img_id = cts_db_get_next_id(CTS_TABLE_DATA);
+                       img_id = ctsvc_db_get_next_id(CTS_TABLE_DATA);
                        ret = ctsvc_contact_add_image_file(contact->contact_id, img_id, contact->image_thumbnail_path,
                                        image, sizeof(image));
                }
@@ -240,10 +243,9 @@ static int __ctsvc_db_simple_contact_update_record( contacts_record_h record )
 
                snprintf(query, sizeof(query), "UPDATE %s SET %s WHERE contact_id = %d", CTS_TABLE_CONTACTS, query_set, contact->contact_id);
 
-               stmt = cts_query_prepare(query);
+               ret = ctsvc_query_prepare(query, &stmt);
                if (NULL == stmt) {
-                       CTS_ERR("DB error : cts_query_prepare() Failed");
-                       ret = CONTACTS_ERROR_DB;
+                       CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                        break;
                }
 
@@ -252,17 +254,17 @@ static int __ctsvc_db_simple_contact_update_record( contacts_record_h record )
                        for (cursor=bind_text,i=1;cursor;cursor=cursor->next,i++) {
                                const char *text = cursor->data;
                                if (*text)
-                                       cts_stmt_bind_text(stmt, i, text);
+                                       ctsvc_stmt_bind_text(stmt, i, text);
                        }
                }
 
-               ret = cts_stmt_step(stmt);
+               ret = ctsvc_stmt_step(stmt);
                if (CONTACTS_ERROR_NONE != ret) {
-                       CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        break;
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
        } while (0);
 
        CTSVC_RECORD_RESET_PROPERTY_FLAGS((ctsvc_record_s *)record);
@@ -311,15 +313,15 @@ static int __ctsvc_db_simple_contact_get_all_records( int offset, int limit,
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -327,7 +329,7 @@ static int __ctsvc_db_simple_contact_get_all_records( int offset, int limit,
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -353,11 +355,11 @@ static int __ctsvc_db_simple_contact_get_records_with_query( contacts_query_h qu
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -442,7 +444,7 @@ static int __ctsvc_db_simple_contact_get_records_with_query( contacts_query_h qu
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -469,9 +471,9 @@ static int __ctsvc_db_simple_contact_insert_record( contacts_record_h record, in
        ret = ctsvc_begin_trans();
        RETVM_IF(ret < CONTACTS_ERROR_NONE, ret, "ctsvc_begin_trans() Failed(%d)", ret);
 
-       ret = cts_db_get_next_id(CTS_TABLE_CONTACTS);
+       ret = ctsvc_db_get_next_id(CTS_TABLE_CONTACTS);
        if (ret < CONTACTS_ERROR_NONE) {
-               CTS_ERR("cts_db_get_next_id() Failed(%d)", ret);
+               CTS_ERR("ctsvc_db_get_next_id() Failed(%d)", ret);
                ctsvc_end_trans(false);
                return ret;
        }
@@ -519,32 +521,32 @@ static int __ctsvc_db_simple_contact_insert_record( contacts_record_h record, in
                        contact->contact_id, contact->person_id, contact->addressbook_id, contact->is_favorite,
                        version, version, (int)time(NULL));
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if(NULL == stmt){
-               CTS_ERR("cts_query_prepare() Failed");
+               CTS_ERR("ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        if (contact->uid)
-               cts_stmt_bind_text(stmt, 1, contact->uid);
+               ctsvc_stmt_bind_text(stmt, 1, contact->uid);
        if (contact->ringtone_path)
-               cts_stmt_bind_text(stmt, 2, contact->ringtone_path);
+               ctsvc_stmt_bind_text(stmt, 2, contact->ringtone_path);
        if (contact->vibration)
-               cts_stmt_bind_text(stmt, 3, contact->vibration);
+               ctsvc_stmt_bind_text(stmt, 3, contact->vibration);
        if (contact->message_alert)
-               cts_stmt_bind_text(stmt, 4, contact->message_alert);
+               ctsvc_stmt_bind_text(stmt, 4, contact->message_alert);
        if (contact->image_thumbnail_path)
-               cts_stmt_bind_text(stmt, 5, contact->image_thumbnail_path);
+               ctsvc_stmt_bind_text(stmt, 5, contact->image_thumbnail_path);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ctsvc_set_contact_noti();
 
index 40f1e36..826f2ec 100644 (file)
@@ -75,10 +75,10 @@ static int __ctsvc_db_speeddial_insert_record( contacts_record_h record, int *id
                return ret;
        }
 
-       ret = cts_db_change();
+       ret = ctsvc_db_change();
        if (0 < ret) {
                if (id)
-                       *id  = cts_db_get_last_insert_id();
+                       *id  = ctsvc_db_get_last_insert_id();
                ctsvc_set_speed_noti();
        }
        else {
@@ -139,19 +139,22 @@ static int __ctsvc_db_speeddial_get_record( int id, contacts_record_h* out_recor
                        "WHERE speed_number = %d",
                        ctsvc_get_display_column(), id);
 
-       stmt = cts_query_prepare(query);
-               RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return ret;
+               CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ret = __ctsvc_db_speeddial_value_set(stmt, &record);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("__ctsvc_db_speeddial_value_set(ALL) Failed(%d)", ret);
                return ret;
@@ -181,7 +184,7 @@ static int __ctsvc_db_speeddial_update_record( contacts_record_h record )
                "SELECT speed_number FROM "CTS_TABLE_SPEEDDIALS" WHERE speed_number = %d", speeddial->dial_number);
        ret = ctsvc_query_get_first_int_result(query, &speeddial_id);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
+               CTS_ERR("DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
                ctsvc_end_trans(false);
                return ret;
        }
@@ -189,22 +192,22 @@ static int __ctsvc_db_speeddial_update_record( contacts_record_h record )
        snprintf(query, sizeof(query), "UPDATE "CTS_TABLE_SPEEDDIALS" "
                        "SET number_id = %d WHERE speed_number = %d",
                        speeddial->number_id, speeddial->dial_number);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
-       ret = cts_db_change();
-       cts_stmt_finalize(stmt);
+       ret = ctsvc_db_change();
+       ctsvc_stmt_finalize(stmt);
 
        if (0 < ret) {
                ctsvc_set_speed_noti();
@@ -242,22 +245,22 @@ static int __ctsvc_db_speeddial_delete_record( int id )
 
        snprintf(query, sizeof(query), "DELETE FROM %s WHERE speed_number = %d",
                        CTS_TABLE_SPEEDDIALS, id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
-       ret = cts_db_change();
-       cts_stmt_finalize(stmt);
+       ret = ctsvc_db_change();
+       ctsvc_stmt_finalize(stmt);
 
        if (0 < ret) {
                ctsvc_set_speed_noti();
@@ -293,15 +296,15 @@ static int __ctsvc_db_speeddial_get_all_records( int offset, int limit, contacts
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -309,7 +312,7 @@ static int __ctsvc_db_speeddial_get_all_records( int offset, int limit, contacts
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -335,11 +338,11 @@ static int __ctsvc_db_speeddial_get_records_with_query( contacts_query_h query,
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt is failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -404,7 +407,7 @@ static int __ctsvc_db_speeddial_get_records_with_query( contacts_query_h query,
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
index a77d195..d657b0e 100644 (file)
@@ -129,19 +129,22 @@ static int __ctsvc_db_url_get_record( int id, contacts_record_h* out_record )
                                "WHERE id = %d AND datatype = %d ",
                                id, CTSVC_DATA_URL);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
-               return CONTACTS_ERROR_NO_DATA;
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ctsvc_db_url_get_value_from_stmt(stmt, out_record, 0);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -262,21 +265,21 @@ static int __ctsvc_db_url_get_all_records( int offset, int limit, contacts_list_
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB : cts_stmt_step fail(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB : ctsvc_stmt_step fail(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
                ctsvc_db_url_get_value_from_stmt(stmt, (contacts_record_h*)&url, 0);
                ctsvc_list_prepend(list, (contacts_record_h)url);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -301,11 +304,11 @@ static int __ctsvc_db_url_get_records_with_query( contacts_query_h query, int of
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_db_make_get_records_query_stmt fail(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 /*CTS_TRUE */ != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -355,7 +358,7 @@ static int __ctsvc_db_url_get_records_with_query( contacts_query_h query, int of
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
index 829c375..c4d0225 100644 (file)
@@ -69,25 +69,25 @@ int ctsvc_db_url_insert(contacts_record_h record, int contact_id, bool is_my_pro
                                                                        "VALUES(%d, %d, %d, %d, ?, ?)",
                                                        contact_id, is_my_profile, CTSVC_DATA_URL, url->type);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (url->label)
-               cts_stmt_bind_text(stmt, 1, url->label);
+               ctsvc_stmt_bind_text(stmt, 1, url->label);
        if (url->url)
-               cts_stmt_bind_text(stmt, 2, url->url);
+               ctsvc_stmt_bind_text(stmt, 2, url->url);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("DB error : ctsvc_query_exec() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
-       //url->id = cts_db_get_last_insert_id();
+       //url->id = ctsvc_db_get_last_insert_id();
        if (id)
-               *id = cts_db_get_last_insert_id();
-       cts_stmt_finalize(stmt);
+               *id = ctsvc_db_get_last_insert_id();
+       ctsvc_stmt_finalize(stmt);
 
        if (!is_my_profile)
                ctsvc_set_url_noti();
index 70c8b4e..ed85913 100755 (executable)
@@ -496,27 +496,24 @@ int ctsvc_db_update_record_with_set_query(const char *set, GSList *bind_text, co
 
        snprintf(query, sizeof(query), "UPDATE %s SET %s WHERE id = %d", table, set, id);
 
-       stmt = cts_query_prepare(query);
-       if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
-               return CONTACTS_ERROR_DB;
-       }
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        if (bind_text) {
                int i = 0;
                for (cursor=bind_text,i=1;cursor;cursor=cursor->next,i++) {
                        const char *text = cursor->data;
                        if (text && *text)
-                               cts_stmt_bind_text(stmt, i, text);
+                               ctsvc_stmt_bind_text(stmt, i, text);
                }
        }
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        return ret;
 }
 
@@ -757,17 +754,17 @@ int ctsvc_db_make_get_records_query_stmt(ctsvc_query_s *s_query, int offset, int
        free(projection);
 
        CTS_DBG("query : %s", query);
-       *stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, stmt);
        if(NULL == *stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                for (cursor=bind_text;cursor;cursor=cursor->next)
                        free(cursor->data);
                g_slist_free(bind_text);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        for (cursor=bind_text, i=1; cursor;cursor=cursor->next, i++)
-               cts_stmt_bind_copy_text(*stmt, i, cursor->data, strlen(cursor->data));
+               ctsvc_stmt_bind_copy_text(*stmt, i, cursor->data, strlen(cursor->data));
 
        for (cursor=bind_text;cursor;cursor=cursor->next)
                free(cursor->data);
@@ -789,12 +786,12 @@ static int __ctsvc_db_get_records_with_query_exec(ctsvc_query_s *query, int offs
        RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "DB error : ctsvc_db_make_get_records_query_stmt(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                int field_count;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -835,7 +832,7 @@ static int __ctsvc_db_get_records_with_query_exec(ctsvc_query_s *query, int offs
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -873,19 +870,19 @@ static int __ctsvc_db_get_all_records_exec(const char *view_uri, const property_
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        r_type = ctsvc_view_get_record_type(view_uri);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
-                       return CONTACTS_ERROR_NO_DATA;
+                       return ret;
                }
 
                contacts_record_create(view_uri, &record);
@@ -906,7 +903,7 @@ static int __ctsvc_db_get_all_records_exec(const char *view_uri, const property_
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = (contacts_list_h)list;
@@ -1208,19 +1205,19 @@ static int __ctsvc_db_search_records_exec(const char *view_uri, const property_i
                        len += snprintf(query+len, sizeof(query)-len, " OFFSET %d", offset);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        r_type = ctsvc_view_get_record_type(view_uri);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
-                       return CONTACTS_ERROR_NO_DATA;
+                       return ret;
                }
 
                if( r_type == CTSVC_RECORD_PERSON )
@@ -1263,7 +1260,7 @@ static int __ctsvc_db_search_records_exec(const char *view_uri, const property_i
                ctsvc_list_prepend(list, record);
        }
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
        *out_list = (contacts_list_h)list;
        return CONTACTS_ERROR_NONE;
@@ -1404,20 +1401,20 @@ static inline int __ctsvc_db_search_records_with_query_exec(ctsvc_query_s *s_que
        }
 
        CTS_DBG("%s", query);
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        i = 1;
        len = g_slist_length(bind);
        for (cursor=bind; cursor;cursor=cursor->next, i++)
-               sqlite3_bind_text(stmt, i, cursor->data, strlen(cursor->data), SQLITE_STATIC);
+               ctsvc_stmt_bind_text(stmt, i, cursor->data);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -1485,7 +1482,7 @@ static inline int __ctsvc_db_search_records_with_query_exec(ctsvc_query_s *s_que
                }
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
        *out_list = list;
@@ -1700,7 +1697,7 @@ static int __ctsvc_db_update_records( contacts_list_h list)
        RETVM_IF(count <= 0, CONTACTS_ERROR_INVALID_PARAMETER, "Invalid parameter : count is 0");
 
        ret = ctsvc_begin_trans();
-       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_server_db_begin_trans is failed(%d)", ret);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret, "ctsvc_begin_trans is failed(%d)", ret);
 
        contacts_list_first(list);
        do {
@@ -1725,7 +1722,6 @@ static int __ctsvc_db_update_records( contacts_list_h list)
                return ret;
        }
 
-
        return CONTACTS_ERROR_NONE;
 }
 
@@ -1762,6 +1758,7 @@ static int __ctsvc_db_get_count_exec(const char *view_uri, const property_info_s
        len = snprintf(query, sizeof(query), "SELECT COUNT(*) FROM (SELECT %s FROM %s)", projection, table);
 
        ret = ctsvc_query_get_first_int_result(query, out_count);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
 
        return ret;
 }
@@ -1809,18 +1806,18 @@ static int __ctsvc_db_get_count_with_query_exec(ctsvc_query_s *s_query, const ch
                cts_stmt stmt;
                GSList *cursor;
                int i;
-               stmt = cts_query_prepare(query);
-               if(NULL == stmt) {
-                       CTS_ERR("DB error : cts_query_prepare() Failed");
-                       return CONTACTS_ERROR_DB;
-               }
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
                for (cursor=bind_text, i=1; cursor;cursor=cursor->next, i++)
-                       cts_stmt_bind_copy_text(stmt, i, cursor->data, strlen(cursor->data));
+                       ctsvc_stmt_bind_copy_text(stmt, i, cursor->data, strlen(cursor->data));
                ret = ctsvc_stmt_get_first_int_result(stmt, out_count);
+               RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_stmt_get_first_int_result() Failed(%d)", ret);
        }
-       else
+       else {
                ret = ctsvc_query_get_first_int_result(query, out_count);
+               RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       }
        return ret;
 }
 
@@ -1932,17 +1929,17 @@ static int __ctsvc_db_get_contact_changes(const char* view_uri, int addressbook_
                        CONTACTS_CHANGE_DELETED, version ,version);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                ctsvc_updated_info_s *update_info;
 
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -1963,12 +1960,13 @@ static int __ctsvc_db_get_contact_changes(const char* view_uri, int addressbook_
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
-       *out_list = list;
        snprintf(query, sizeof(query), "SELECT ver FROM "CTS_TABLE_VERSION);
        ret = ctsvc_query_get_first_int_result(query, out_current_version);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       *out_list = list;
 
        return CONTACTS_ERROR_NONE;
 }
@@ -2002,17 +2000,17 @@ static int __ctsvc_db_get_group_changes(const char* view_uri, int addressbook_id
                        CONTACTS_CHANGE_DELETED, CTS_TABLE_GROUP_DELETEDS, version, version);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                ctsvc_updated_info_s *update_info;
 
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -2030,12 +2028,13 @@ static int __ctsvc_db_get_group_changes(const char* view_uri, int addressbook_id
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
-       *out_list = list;
        snprintf(query, sizeof(query), "SELECT ver FROM "CTS_TABLE_VERSION);
        ret = ctsvc_query_get_first_int_result(query, out_current_version);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       *out_list = list;
 
        return CONTACTS_ERROR_NONE;
 }
@@ -2067,15 +2066,15 @@ static int __ctsvc_db_get_group_relations_changes(const char* view_uri, int addr
                                "AND addressbook_id = %d ", addressbook_id);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -2089,12 +2088,12 @@ static int __ctsvc_db_get_group_relations_changes(const char* view_uri, int addr
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
-
-       *out_list = list;
        snprintf(query, sizeof(query), "SELECT ver FROM "CTS_TABLE_VERSION);
        ret = ctsvc_query_get_first_int_result(query, out_current_version);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       *out_list = list;
 
        return CONTACTS_ERROR_NONE;
 }
@@ -2115,15 +2114,15 @@ static int __ctsvc_db_get_group_member_changes(const char* view_uri, int address
        if (0 <= addressbook_id)
                len += snprintf(query+len, sizeof(query)-len, " AND addressbook_id = %d ", addressbook_id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -2135,12 +2134,13 @@ static int __ctsvc_db_get_group_member_changes(const char* view_uri, int address
 
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
-       *out_list = list;
        snprintf(query, sizeof(query), "SELECT ver FROM "CTS_TABLE_VERSION);
        ret = ctsvc_query_get_first_int_result(query, out_current_version);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       *out_list = list;
 
        return CONTACTS_ERROR_NONE;
 }
@@ -2182,15 +2182,15 @@ static int __ctsvc_db_get_my_profile_changes(const char* view_uri, int addressbo
                        CONTACTS_CHANGE_DELETED, CTS_TABLE_MY_PROFILES, version);
        }
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB , "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
        contacts_list_create(&list);
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                contacts_record_h record;
                if (1 != ret) {
-                       CTS_ERR("DB error : cts_stmt_step() Failed(%d)", ret);
-                       cts_stmt_finalize(stmt);
+                       CTS_ERR("DB error : ctsvc_stmt_step() Failed(%d)", ret);
+                       ctsvc_stmt_finalize(stmt);
                        contacts_list_destroy(list, true);
                        return ret;
                }
@@ -2201,12 +2201,13 @@ static int __ctsvc_db_get_my_profile_changes(const char* view_uri, int addressbo
                ctsvc_record_set_int(record, _contacts_my_profile_updated_info.last_changed_type, ctsvc_stmt_get_int(stmt, 2));
                ctsvc_list_prepend(list, record);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        ctsvc_list_reverse(list);
 
-       *out_list = list;
        snprintf(query, sizeof(query), "SELECT ver FROM "CTS_TABLE_VERSION);
        ret = ctsvc_query_get_first_int_result(query, out_current_version);
+       RETVM_IF(CONTACTS_ERROR_NONE != ret, ret , "DB error : ctsvc_query_get_first_int_result() Failed(%d)", ret);
+       *out_list = list;
 
        return CONTACTS_ERROR_NONE;
 }
@@ -2468,7 +2469,7 @@ int ctsvc_db_insert_records(contacts_list_h list, int **ids, unsigned int *count
 
        if (count)
                contacts_list_get_count(list, count);
-       if (( plugin_info = ctsvc_db_get_plugin_info(((ctsvc_list_s*)list)->l_type))){
+       if (( plugin_info = ctsvc_db_get_plugin_info(((ctsvc_list_s*)list)->l_type))) {
                if( plugin_info->insert_records ) {
                        ret = plugin_info->insert_records( list, ids );
                        return ret;
index eb07c46..c3c1b50 100644 (file)
@@ -66,15 +66,14 @@ int ctsvc_group_add_contact_in_transaction(int group_id, int contact_id)
 
        snprintf(query, sizeof(query), "INSERT OR REPLACE INTO %s VALUES(%d, %d, %d, 0)",
                        CTS_TABLE_GROUP_RELATIONS, group_id, contact_id, version);
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_stmt_step(stmt);
+       WARN_IF(CONTACTS_ERROR_NONE != ret, "ctsvc_stmt_step() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
-       WARN_IF(CONTACTS_ERROR_NONE != ret, "cts_stmt_step() Failed(%d)", ret);
-
-       rel_changed = cts_db_change();
-       cts_stmt_finalize(stmt);
+       rel_changed = ctsvc_db_change();
+       ctsvc_stmt_finalize(stmt);
 
        if (0 < rel_changed) {
                snprintf(query, sizeof(query),
@@ -148,14 +147,14 @@ int ctsvc_group_remove_contact_in_transaction(int group_id, int contact_id)
                        "UPDATE %s SET deleted=1, ver = %d WHERE group_id = %d AND contact_id = %d",
                        CTS_TABLE_GROUP_RELATIONS, version, group_id, contact_id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB Error: cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
-       WARN_IF(CONTACTS_ERROR_NONE != ret, "DB Error: cts_stmt_step() Failed(%d)", ret);
+       ret = ctsvc_stmt_step(stmt);
+       WARN_IF(CONTACTS_ERROR_NONE != ret, "DB Error: ctsvc_stmt_step() Failed(%d)", ret);
 
-       int rel_changed = cts_db_change();
-       cts_stmt_finalize(stmt);
+       int rel_changed = ctsvc_db_change();
+       ctsvc_stmt_finalize(stmt);
 
        if (0 <= rel_changed) {
                snprintf(query, sizeof(query),
@@ -231,29 +230,29 @@ API int contacts_group_set_group_order(int group_id, int previous_group_id, int
                                "Permission denied : contact write (group)");
        snprintf(query, sizeof(query), "SELECT group_prio, addressbook_id FROM "CTS_TABLE_GROUPS" WHERE group_id = ?");
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       cts_stmt_bind_int(stmt, 1, previous_group_id);
-       ret = cts_stmt_step(stmt);
+       ctsvc_stmt_bind_int(stmt, 1, previous_group_id);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/  == ret) {
                previous_prio = ctsvc_stmt_get_dbl(stmt, 0);
                previous_addressbook_id = ctsvc_stmt_get_int(stmt, 1);
        }
-       cts_stmt_reset(stmt);
-       cts_stmt_bind_int(stmt, 1, next_group_id);
-       ret = cts_stmt_step(stmt);
+       ctsvc_stmt_reset(stmt);
+       ctsvc_stmt_bind_int(stmt, 1, next_group_id);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ == ret) {
                next_prio = ctsvc_stmt_get_dbl(stmt, 0);
                next_addressbook_id = ctsvc_stmt_get_int(stmt, 1);
        }
-       cts_stmt_reset(stmt);
-       cts_stmt_bind_int(stmt, 1, group_id);
-       ret = cts_stmt_step(stmt);
+       ctsvc_stmt_reset(stmt);
+       ctsvc_stmt_bind_int(stmt, 1, group_id);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ == ret) {
                addressbook_id = ctsvc_stmt_get_int(stmt, 1);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        RETVM_IF(0.0 == previous_prio && 0.0 == next_prio, CONTACTS_ERROR_INVALID_PARAMETER,
                        "The indexes for previous and next are invalid.");
index 26d3ebe..3b25758 100644 (file)
@@ -24,7 +24,4 @@ int ctsvc_normalize_number(const char *src, char *dest, int dest_size);
 int ctsvc_get_minmatch_number(const char *src, char *dest, int dest_size, int min_match);
 bool ctsvc_is_phonenumber(const char* src);
 
-void* ctsvc_init_tapi_handle_for_cc();
-void ctsvc_deinit_tapi_handle_for_cc();
-
 #endif /*  __TIZEN_SOCIAL_CTSVC_NUMBER_UTILS_H__ */
index 3a3689f..6b84ab1 100644 (file)
@@ -52,14 +52,17 @@ static inline int __ctsvc_get_person_default_number_value(int id, contacts_recor
                                "WHERE contacts.person_id = %d",
                                CTS_TABLE_CONTACTS, CTS_TABLE_DATA, CTSVC_DATA_NUMBER, id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               cts_stmt_finalize(stmt);
-               CTS_ERR("No data : person(%d) has no default phone", id);
-               return CONTACTS_ERROR_NO_DATA;
+               ctsvc_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step Fail(%d)", ret);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ret = contacts_record_create(_contacts_number._uri, (contacts_record_h*)&number);
@@ -81,7 +84,7 @@ static inline int __ctsvc_get_person_default_number_value(int id, contacts_recor
        else
                CTS_ERR("contacts_record_create() Failed");
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        return ret;
 }
 
@@ -99,15 +102,17 @@ static inline int __ctsvc_get_person_default_email_value(int id, contacts_record
                                        "WHERE contacts.person_id = %d",
                                        CTS_TABLE_CONTACTS, CTS_TABLE_DATA, CTSVC_DATA_EMAIL, id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
-
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               cts_stmt_finalize(stmt);
-               CTS_ERR("person(%d) has no default email", id);
-               return CONTACTS_ERROR_NO_DATA;
+               ctsvc_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step Fail(%d)", ret);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ret = contacts_record_create(_contacts_email._uri, (contacts_record_h*)&email);
@@ -127,7 +132,7 @@ static inline int __ctsvc_get_person_default_email_value(int id, contacts_record
        else
                CTS_ERR("contacts_record_create() Failed");
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        return ret;
 }
 
@@ -146,14 +151,17 @@ static inline int __ctsvc_get_person_default_image_value(int id, contacts_record
                                "WHERE contacts.person_id = %d",
                                        CTSVC_DATA_IMAGE, id);
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ != ret) {
-               cts_stmt_finalize(stmt);
-               CTS_ERR("person(%d) has no default image", id);
-               return CONTACTS_ERROR_NO_DATA;
+               ctsvc_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step Fail(%d)", ret);
+               if (CONTACTS_ERROR_NONE == ret)
+                       return CONTACTS_ERROR_NO_DATA;
+               else
+                       return ret;
        }
 
        ret = contacts_record_create(_contacts_image._uri, (contacts_record_h*)&image);
@@ -173,7 +181,7 @@ static inline int __ctsvc_get_person_default_image_value(int id, contacts_record
        else
                CTS_ERR("contacts_record_create() Failed");
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        return ret;
 }
 
@@ -274,16 +282,16 @@ static inline int __ctsvc_put_person_default_image(int person_id, int id)
                                "ON D.contact_id = C.contact_id AND C.deleted = 0 "
                                "WHERE D.datatype=%d AND D.is_my_profile = 0 AND C.person_id=%d AND D.id=%d",
                                CTSVC_DATA_IMAGE, person_id, id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare failed");
+               CTS_ERR("ctsvc_query_prepare failed(%d)", ret);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                ctsvc_end_trans(false);
                return ret;
        }
@@ -291,7 +299,7 @@ static inline int __ctsvc_put_person_default_image(int person_id, int id)
        is_default = ctsvc_stmt_get_int(stmt, 0);
        contact_id = ctsvc_stmt_get_int(stmt, 1);
        image_path = SAFE_STRDUP(ctsvc_stmt_get_text(stmt, 2));
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        // unset is_primary_default of all data of the person
        snprintf(query, sizeof(query),
@@ -337,46 +345,46 @@ static inline int __ctsvc_put_person_default_image(int person_id, int id)
        // update person's image_thumbnail_path
        snprintf(query, sizeof(query),
                        "UPDATE "CTS_TABLE_PERSONS" SET image_thumbnail_path=? WHERE person_id=%d ", person_id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if( NULL == stmt ) {
-               CTS_ERR( "cts_query_prepare() Failed()");
+               CTS_ERR( "ctsvc_query_prepare() Failed(%d)", ret);
                free(image_path);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       cts_stmt_bind_text(stmt, 1, image_path);
-       ret = cts_stmt_step(stmt);
+       ctsvc_stmt_bind_text(stmt, 1, image_path);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                free(image_path);
                ctsvc_end_trans(false);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        // update contact's image_thumbnail_path
        snprintf(query, sizeof(query),
                        "UPDATE "CTS_TABLE_CONTACTS" SET image_thumbnail_path=? WHERE contact_id=%d ", contact_id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if( NULL == stmt ) {
-               CTS_ERR( "cts_query_prepare() Failed");
+               CTS_ERR( "ctsvc_query_prepare() Failed(%d)", ret);
                free(image_path);
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       cts_stmt_bind_text(stmt, 1, image_path);
-       ret = cts_stmt_step(stmt);
+       ctsvc_stmt_bind_text(stmt, 1, image_path);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                free(image_path);
                ctsvc_end_trans(false);
                return ret;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        free(image_path);
 
@@ -400,22 +408,20 @@ static inline int __ctsvc_put_person_default_data(int person_id, int id, int dat
                                "WHERE D.datatype=%d AND C.person_id=%d AND D.id=%d",
                                CTS_TABLE_DATA, CTS_TABLE_CONTACTS, datatype, person_id, id);
 
-       stmt = cts_query_prepare(query);
-       if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare Fail(stmt NULL)");
-               return CONTACTS_ERROR_DB;
-       }
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
+
+       ret = ctsvc_stmt_step(stmt);
        if (1 != ret) {
-               CTS_ERR("cts_stmt_step Fail(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step Fail(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                return ret;
        }
 
        is_default = ctsvc_stmt_get_int(stmt, 0);
        contact_id = ctsvc_stmt_get_int(stmt, 1);
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        ret = ctsvc_begin_trans();
        RETVM_IF(CONTACTS_ERROR_NONE > ret, ret, "DB error : ctsvc_begin_trans() Failed(%d)", ret);
@@ -530,7 +536,7 @@ void ctsvc_db_person_delete_callback(sqlite3_context * context,
 #endif
 }
 
-inline static const char* __cts_get_image_filename(const char* src)
+inline static const char* __ctsvc_get_image_filename(const char* src)
 {
        const char* dir = CTS_IMG_FULL_LOCATION;
        int pos=0;
@@ -578,13 +584,11 @@ int ctsvc_person_aggregate(int person_id)
                                        "message_alert "
                                "FROM "CTS_TABLE_PERSONS" "
                                "WHERE persons.person_id = %d", person_id);
-       stmt = cts_query_prepare(query);
-       if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
-               return CONTACTS_ERROR_DB;
-       }
-       if (1 != cts_stmt_step(stmt)) {
-          CTS_ERR("cts_stmt_step() Failed\n");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
+
+       if (1 != ctsvc_stmt_step(stmt)) {
+          CTS_ERR("ctsvc_stmt_step() Failed\n");
           return CONTACTS_ERROR_DB;
        }
        ret = contacts_record_create(_contacts_person._uri, (contacts_record_h*)&person);
@@ -602,7 +606,7 @@ int ctsvc_person_aggregate(int person_id)
        person->vibration = SAFE_STRDUP(temp);
        temp = ctsvc_stmt_get_text(stmt, 5);
        person->message_alert = SAFE_STRDUP(temp);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        snprintf(query, sizeof(query),
                        "SELECT contact_id FROM %s "
@@ -620,7 +624,7 @@ int ctsvc_person_aggregate(int person_id)
        }
 
        if (person->image_thumbnail_path) {
-               temp = __cts_get_image_filename(person->image_thumbnail_path);
+               temp = __ctsvc_get_image_filename(person->image_thumbnail_path);
                snprintf(query, sizeof(query),
                        "SELECT D.id FROM "CTS_TABLE_CONTACTS" C, "CTS_TABLE_DATA" D "
                                "WHERE C.person_id=%d AND C.contact_id=D.contact_id AND C.deleted = 0 "
@@ -641,19 +645,19 @@ int ctsvc_person_aggregate(int person_id)
                "WHERE c.person_id=%d "
                "ORDER BY timestamp DESC LIMIT 1",
                CTS_TABLE_CONTACTS, CTS_TABLE_ACTIVITIES, person->person_id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                free(image_thumbnail_path);
                contacts_record_destroy((contacts_record_h)person, true);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
-       if (1 == cts_stmt_step(stmt)) {
+       if (1 == ctsvc_stmt_step(stmt)) {
                temp = ctsvc_stmt_get_text(stmt, 0);
                status = SAFE_STRDUP(temp);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        if (person->ringtone_path)
                ringtone_path = SAFE_STRDUP(person->ringtone_path);
@@ -670,19 +674,19 @@ int ctsvc_person_aggregate(int person_id)
                        "WHERE person_id = %d AND contacts.deleted = 0 "
                        "ORDER BY contact_id",
                        ctsvc_get_display_column(), CTS_TABLE_CONTACTS, person_id);
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                free(image_thumbnail_path);
                free(ringtone_path);
                free(vibration);
                free(message_alert);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        link_count = 0;
        len = 0;
-       while ((ret = cts_stmt_step(stmt))) {
+       while ((ret = ctsvc_stmt_step(stmt))) {
                const char *temp_str;
                int i = 0;
                int contact_id;
@@ -734,7 +738,7 @@ int ctsvc_person_aggregate(int person_id)
                len += snprintf(addressbook_ids + len, addressbooks_len -len, "%d%s", addressbook_id, ADDRESSBOOK_ID_DELIM );
 
                if (!image_thumbnail_path && contact_image_thumbnail_path && *contact_image_thumbnail_path) {
-                       temp = __cts_get_image_filename(contact_image_thumbnail_path);
+                       temp = __ctsvc_get_image_filename(contact_image_thumbnail_path);
                        image_thumbnail_path = SAFE_STRDUP(temp);
                        // update data table : is_primary_default
                }
@@ -755,7 +759,7 @@ int ctsvc_person_aggregate(int person_id)
                if (is_favorite)
                        person_is_favorite = true;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        version = ctsvc_get_next_ver();
 
        snprintf(query, sizeof(query),
@@ -769,34 +773,34 @@ int ctsvc_person_aggregate(int person_id)
                        name_contact_id, version, person_id,
                        person_id, link_count, person_id);
 
-       stmt = cts_query_prepare(query);
+       ret = ctsvc_query_prepare(query, &stmt);
        if (NULL == stmt) {
-               CTS_ERR("DB error : cts_query_prepare() Failed");
+               CTS_ERR("DB error : ctsvc_query_prepare() Failed(%d)", ret);
                free(addressbook_ids);
                free(image_thumbnail_path);
                free(ringtone_path);
                free(vibration);
                free(message_alert);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        if (addressbook_ids)
-               cts_stmt_bind_text(stmt, 1, addressbook_ids);
+               ctsvc_stmt_bind_text(stmt, 1, addressbook_ids);
        if (ringtone_path)
-               cts_stmt_bind_text(stmt, 2, ringtone_path);
+               ctsvc_stmt_bind_text(stmt, 2, ringtone_path);
        if (vibration)
-               cts_stmt_bind_text(stmt, 3, vibration);
+               ctsvc_stmt_bind_text(stmt, 3, vibration);
        if (message_alert)
-               cts_stmt_bind_text(stmt, 4, message_alert);
+               ctsvc_stmt_bind_text(stmt, 4, message_alert);
        if (status)
-               cts_stmt_bind_text(stmt, 5, status);
+               ctsvc_stmt_bind_text(stmt, 5, status);
        if (image_thumbnail_path)
-               cts_stmt_bind_text(stmt, 6, image_thumbnail_path);
+               ctsvc_stmt_bind_text(stmt, 6, image_thumbnail_path);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
-               CTS_ERR("cts_stmt_step() Failed(%d)", ret);
-               cts_stmt_finalize(stmt);
+               CTS_ERR("ctsvc_stmt_step() Failed(%d)", ret);
+               ctsvc_stmt_finalize(stmt);
                free(addressbook_ids);
                free(image_thumbnail_path);
                free(ringtone_path);
@@ -805,7 +809,7 @@ int ctsvc_person_aggregate(int person_id)
                return ret;
        }
 
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        free(addressbook_ids);
        free(image_thumbnail_path);
@@ -838,16 +842,16 @@ static bool __ctsvc_get_person_favorite_info(int person_id, double *priority)
        char query[CTS_SQL_MIN_LEN] = {0};
        snprintf(query, sizeof(query),
                        "SELECT favorite_prio FROM "CTS_TABLE_FAVORITES" WHERE person_id = %d", person_id);
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       ret = cts_stmt_step(stmt);
+       ret = ctsvc_stmt_step(stmt);
        if (1 == ret) {
                *priority = ctsvc_stmt_get_dbl(stmt, 0);
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                return true;
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
        return false;
 }
 
@@ -985,10 +989,10 @@ static int __ctsvc_update_primary_default_data(int person_id)
                                "WHERE person_id = %d AND deleted = 0 "
                                "ORDER BY contact_id",
                                CTS_TABLE_CONTACTS, person_id);
-               stmt = cts_query_prepare(query);
-               RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "cts_query_prepare fail(%d)", CONTACTS_ERROR_DB);
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-               while (1 == cts_stmt_step(stmt)) {
+               while (1 == ctsvc_stmt_step(stmt)) {
                        int contact_id = ctsvc_stmt_get_int(stmt, 0);
                        cts_stmt stmt_number;
 
@@ -997,17 +1001,18 @@ static int __ctsvc_update_primary_default_data(int person_id)
                                        "WHERE contact_id = %d AND datatype = %d AND is_default = 1 AND is_my_profile = 0",
                                        CTS_TABLE_DATA, contact_id, CTSVC_DATA_NUMBER);
 
-                       stmt_number = cts_query_prepare(query);
+                       ret = ctsvc_query_prepare(query, &stmt_number);
+                       RETVM_IF(NULL == stmt_number, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-                       if( 1 == cts_stmt_step(stmt_number) ) {
+                       if( 1 == ctsvc_stmt_step(stmt_number) ) {
                                int default_number_id = ctsvc_stmt_get_int(stmt_number, 0);
                                __ctsvc_put_person_default_data(person_id, default_number_id, CTSVC_DATA_NUMBER);
-                               cts_stmt_finalize(stmt_number);
+                               ctsvc_stmt_finalize(stmt_number);
                                break;
                        }
-                       cts_stmt_finalize(stmt_number);
+                       ctsvc_stmt_finalize(stmt_number);
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
        }
        else {
                contacts_record_destroy(record, true);
@@ -1021,10 +1026,10 @@ static int __ctsvc_update_primary_default_data(int person_id)
                                "WHERE person_id = %d AND deleted = 0 "
                                "ORDER BY contact_id",
                                CTS_TABLE_CONTACTS, person_id);
-               stmt = cts_query_prepare(query);
-               RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "cts_query_prepare fail(%d)", CONTACTS_ERROR_DB);
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-               while (1 == cts_stmt_step(stmt)) {
+               while (1 == ctsvc_stmt_step(stmt)) {
                        int contact_id = ctsvc_stmt_get_int(stmt, 0);
                        cts_stmt stmt_email;
 
@@ -1033,17 +1038,18 @@ static int __ctsvc_update_primary_default_data(int person_id)
                                        "WHERE contact_id = %d AND datatype = %d AND is_default = 1 AND is_my_profile = 0",
                                        CTS_TABLE_DATA, contact_id, CTSVC_DATA_EMAIL);
 
-                       stmt_email = cts_query_prepare(query);
+                       ret = ctsvc_query_prepare(query, &stmt_email);
+                       RETVM_IF(NULL == stmt_email, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-                       if( 1 == cts_stmt_step(stmt_email))     {
+                       if( 1 == ctsvc_stmt_step(stmt_email))   {
                                int default_email_id = ctsvc_stmt_get_int(stmt_email, 0);
                                __ctsvc_put_person_default_data(person_id, default_email_id, CTSVC_DATA_EMAIL);
-                               cts_stmt_finalize(stmt_email);
+                               ctsvc_stmt_finalize(stmt_email);
                                break;
                        }
-                       cts_stmt_finalize(stmt_email);
+                       ctsvc_stmt_finalize(stmt_email);
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
        }
        else {
                contacts_record_destroy(record, true);
@@ -1057,10 +1063,10 @@ static int __ctsvc_update_primary_default_data(int person_id)
                                "WHERE person_id = %d AND deleted = 0 "
                                "ORDER BY contact_id",
                                CTS_TABLE_CONTACTS, person_id);
-               stmt = cts_query_prepare(query);
-               RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "cts_query_prepare fail(%d)", CONTACTS_ERROR_DB);
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-               while ( 1 == cts_stmt_step(stmt)) {
+               while ( 1 == ctsvc_stmt_step(stmt)) {
                        int contact_id = ctsvc_stmt_get_int(stmt, 0);
                        cts_stmt stmt_image;
 
@@ -1069,16 +1075,18 @@ static int __ctsvc_update_primary_default_data(int person_id)
                                        "WHERE contact_id = %d AND datatype = %d AND is_default = 1 AND is_my_profile = 0",
                                        CTS_TABLE_DATA, contact_id, CTSVC_DATA_IMAGE);
 
-                       stmt_image = cts_query_prepare(query);
-                       if( 1 == cts_stmt_step(stmt_image))     {
+                       ret = ctsvc_query_prepare(query, &stmt_image);
+                       RETVM_IF(NULL == stmt_image, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
+
+                       if( 1 == ctsvc_stmt_step(stmt_image))   {
                                int default_image_id = ctsvc_stmt_get_int(stmt_image, 0);
                                __ctsvc_put_person_default_image(person_id, default_image_id);
-                               cts_stmt_finalize(stmt_image);
+                               ctsvc_stmt_finalize(stmt_image);
                                break;
                        }
-                       cts_stmt_finalize(stmt_image);
+                       ctsvc_stmt_finalize(stmt_image);
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
        }
        else {
                contacts_record_destroy(record, true);
@@ -1194,20 +1202,21 @@ API int contacts_person_unlink_contact(int person_id, int contact_id, int* out_p
 
 int ctsvc_person_do_garbage_collection(void)
 {
+       int ret;
        cts_stmt stmt = NULL;
        char query[CTS_SQL_MIN_LEN] = {0};
 
        snprintf(query, sizeof(query), "SELECT person_id FROM "CTS_TABLE_PERSONS" WHERE dirty=1");
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "DB error : cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       while ( 1 /*CTS_TRUE*/ == cts_stmt_step(stmt)) {
+       while ( 1 /*CTS_TRUE*/ == ctsvc_stmt_step(stmt)) {
                int person_id;
                person_id = ctsvc_stmt_get_int(stmt, 0);
                ctsvc_person_aggregate(person_id);
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        return CONTACTS_ERROR_NONE;
 }
@@ -1259,19 +1268,19 @@ API int contacts_person_set_favorite_order(int person_id, int front_person_id, i
 
        snprintf(query, sizeof(query), "SELECT favorite_prio FROM "CTS_TABLE_FAVORITES" WHERE person_id = ?");
 
-       stmt = cts_query_prepare(query);
-       RETVM_IF(NULL == stmt, CONTACTS_ERROR_DB, "cts_query_prepare() Failed");
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       cts_stmt_bind_int(stmt, 1, front_person_id);
-       ret = cts_stmt_step(stmt);
+       ctsvc_stmt_bind_int(stmt, 1, front_person_id);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/  == ret)
                front_prio = ctsvc_stmt_get_dbl(stmt, 0);
-       cts_stmt_reset(stmt);
-       cts_stmt_bind_int(stmt, 1, back_person_id);
-       ret = cts_stmt_step(stmt);
+       ctsvc_stmt_reset(stmt);
+       ctsvc_stmt_bind_int(stmt, 1, back_person_id);
+       ret = ctsvc_stmt_step(stmt);
        if (1 /*CTS_TRUE*/ == ret)
                back_prio = ctsvc_stmt_get_dbl(stmt, 0);
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        RETVM_IF(0.0 == front_prio && 0.0 == back_prio, CONTACTS_ERROR_INVALID_PARAMETER,
                        "The indexes for front and back are invalid.");
index cb5c079..afadbd1 100755 (executable)
@@ -114,15 +114,15 @@ int ctsvc_db_close(void) {
        return CONTACTS_ERROR_NONE /*CTS_SUCCESS*/;
 }
 
-int cts_db_change(void) {
+int ctsvc_db_change(void) {
        return sqlite3_changes(ctsvc_db);
 }
 
-int cts_db_get_last_insert_id(void) {
+int ctsvc_db_get_last_insert_id(void) {
        return sqlite3_last_insert_rowid(ctsvc_db);
 }
 
-int cts_db_get_next_id(const char *table) {
+int ctsvc_db_get_next_id(const char *table) {
        int id;
        int ret;
        char query[CTS_SQL_MAX_LEN] = { 0 };
@@ -251,18 +251,18 @@ int ctsvc_query_exec(const char *query) {
        return CONTACTS_ERROR_NONE /*CTS_SUCCESS*/;
 }
 
-cts_stmt cts_query_prepare(char *query) {
+int ctsvc_query_prepare(char *query, cts_stmt *stmt) {
        int ret = -1;
-       cts_stmt stmt = NULL;
        struct timeval from, now, diff;
        bool retry = false;
+       *stmt = NULL;
 
-       RETVM_IF(NULL == ctsvc_db, NULL, "DB error : Database is not opened");
+       RETVM_IF(NULL == ctsvc_db, CONTACTS_ERROR_DB, "DB error : Database is not opened");
        CTS_DBG("prepare query : %s", query);
 
        gettimeofday(&from, NULL);
        do {
-               ret = sqlite3_prepare_v2(ctsvc_db, query, strlen(query), &stmt, NULL);
+               ret = sqlite3_prepare_v2(ctsvc_db, query, strlen(query), stmt, NULL);
 
                if (ret != SQLITE_OK)
                        CTS_ERR("DB error : sqlite3_prepare_v2() Failed(%d, %s)", ret, sqlite3_errmsg(ctsvc_db));
@@ -277,7 +277,10 @@ cts_stmt cts_query_prepare(char *query) {
                        retry = false;
        }while(retry);
 
-       return stmt;
+       if (ret == SQLITE_OK)
+               return CONTACTS_ERROR_NONE;
+       else
+               return CONTACTS_ERROR_DB;
 }
 
 int ctsvc_stmt_get_first_int_result(cts_stmt stmt, int *result) {
@@ -317,7 +320,7 @@ int ctsvc_stmt_get_first_int_result(cts_stmt stmt, int *result) {
        return CONTACTS_ERROR_NONE;
 }
 
-int cts_stmt_step(cts_stmt stmt) {
+int ctsvc_stmt_step(cts_stmt stmt) {
        int ret;
        struct timeval from, now, diff;
        bool retry = false;
@@ -372,12 +375,12 @@ int cts_stmt_step(cts_stmt stmt) {
        return ret;
 }
 
-void cts_stmt_reset(cts_stmt stmt) {
+void ctsvc_stmt_reset(cts_stmt stmt) {
        sqlite3_reset(stmt);
        sqlite3_clear_bindings(stmt);
 }
 
-void cts_stmt_finalize(cts_stmt stmt) {
+void ctsvc_stmt_finalize(cts_stmt stmt) {
        int ret;
 
        if (NULL == stmt)
index 696b36d..71381f4 100755 (executable)
@@ -33,17 +33,17 @@ typedef sqlite3_stmt* cts_stmt;
 
 int ctsvc_db_open(void);
 int ctsvc_db_close(void);
-int cts_db_change();
-int cts_db_get_last_insert_id(void);
-int cts_db_get_next_id(const char *table);
+int ctsvc_db_change();
+int ctsvc_db_get_last_insert_id(void);
+int ctsvc_db_get_next_id(const char *table);
 
 int ctsvc_query_get_first_int_result(const char *query, int *result);
 int ctsvc_query_exec(const char *query);
-cts_stmt cts_query_prepare(char *query);
+int ctsvc_query_prepare(char *query, cts_stmt *stmt);
 
-int cts_stmt_step(cts_stmt stmt);
-void cts_stmt_reset(cts_stmt stmt);
-void cts_stmt_finalize(cts_stmt stmt);
+int ctsvc_stmt_step(cts_stmt stmt);
+void ctsvc_stmt_reset(cts_stmt stmt);
+void ctsvc_stmt_finalize(cts_stmt stmt);
 
 int ctsvc_stmt_get_first_int_result(cts_stmt stmt, int *result);
 
@@ -61,18 +61,18 @@ static inline long long int ctsvc_stmt_get_int64(cts_stmt stmt, int pos) {
        return sqlite3_column_int64(stmt, pos);
 }
 
-static inline int cts_stmt_bind_int(cts_stmt stmt, int pos, int num) {
+static inline int ctsvc_stmt_bind_int(cts_stmt stmt, int pos, int num) {
        return sqlite3_bind_int(stmt, pos, num);
 }
-static inline int cts_stmt_bind_text(cts_stmt stmt, int pos, const char *str) {
+static inline int ctsvc_stmt_bind_text(cts_stmt stmt, int pos, const char *str) {
        return sqlite3_bind_text(stmt, pos, str, strlen(str), SQLITE_STATIC);
 }
-static inline int cts_stmt_bind_copy_text(cts_stmt stmt, int pos,
+static inline int ctsvc_stmt_bind_copy_text(cts_stmt stmt, int pos,
                const char *str, int strlen){
        return sqlite3_bind_text(stmt, pos, str, strlen, SQLITE_TRANSIENT);
 }
 
-int cts_stmt_bind_copy_text(cts_stmt stmt, int pos, const char *str, int strlen);
+int ctsvc_stmt_bind_copy_text(cts_stmt stmt, int pos, const char *str, int strlen);
 
 
 #endif //__TIZEN_SOCIAL_CTSVC_SQLITE_H__
index dc29af5..4a85d4d 100644 (file)
@@ -64,21 +64,18 @@ static int __ctsvc_server_bg_contact_delete_step1(__ctsvc_delete_data_s* data)
        int count = 0;
        GSList *cursor;
 
-       if (data->contact_ids == NULL){
+       if (data->contact_ids == NULL) {
                // get event_list
                snprintf(query, sizeof(query), "SELECT contact_id FROM "CTS_TABLE_CONTACTS" WHERE deleted = 1");
-               stmt = cts_query_prepare(query);
-               if (NULL == stmt) {
-                       CTS_ERR("cts_query_prepare() Failed");
-                       return CONTACTS_ERROR_DB;
-               }
+               ret = ctsvc_query_prepare(query, &stmt);
+               RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-               while(1 == (ret = cts_stmt_step(stmt))) {
+               while(1 == (ret = ctsvc_stmt_step(stmt))) {
                        int id = 0;
                        id = ctsvc_stmt_get_int(stmt, 0);
                        data->contact_ids = g_slist_append(data->contact_ids, GINT_TO_POINTER(id));
                }
-               cts_stmt_finalize(stmt);
+               ctsvc_stmt_finalize(stmt);
                if (ret < CONTACTS_ERROR_NONE)
                        return ret;
        }
@@ -115,18 +112,15 @@ static int __ctsvc_server_bg_contact_delete_step2(__ctsvc_delete_data_s* data)
                "SELECT id FROM "CTS_TABLE_DATA" WHERE contact_id = %d LIMIT %d",
                data->current_contact_id, CTSVC_SERVER_BG_DELETE_COUNT);
 
-       stmt = cts_query_prepare(query);
-               if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare() Failed");
-               return CONTACTS_ERROR_DB;
-       }
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       while(1 == (ret = cts_stmt_step(stmt))) {
+       while(1 == (ret = ctsvc_stmt_step(stmt))) {
                int id = 0;
                id = ctsvc_stmt_get_int(stmt, 0);
                list = g_slist_append(list, GINT_TO_POINTER(id));
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        count = g_slist_length(list);
        if (count <= 0)
@@ -145,7 +139,7 @@ static int __ctsvc_server_bg_contact_delete_step2(__ctsvc_delete_data_s* data)
                        CTS_ERR("DB failed");
                        ctsvc_end_trans(false);
                        g_slist_free(list);
-                       return CONTACTS_ERROR_DB;
+                       return ret;
                }
                cursor = g_slist_next(cursor);
        }
@@ -172,18 +166,15 @@ static int __ctsvc_server_bg_contact_delete_step3(__ctsvc_delete_data_s* data)
                "SELECT id FROM "CTS_TABLE_ACTIVITIES" WHERE contact_id = %d LIMIT %d",
                data->current_contact_id, CTSVC_SERVER_BG_DELETE_COUNT);
 
-       stmt = cts_query_prepare(query);
-               if (NULL == stmt) {
-               CTS_ERR("cts_query_prepare() Failed");
-               return CONTACTS_ERROR_DB;
-       }
+       ret = ctsvc_query_prepare(query, &stmt);
+       RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Failed(%d)", ret);
 
-       while(1 == (ret = cts_stmt_step(stmt))) {
+       while(1 == (ret = ctsvc_stmt_step(stmt))) {
                int id = 0;
                id = ctsvc_stmt_get_int(stmt, 0);
                list = g_slist_append(list, GINT_TO_POINTER(id));
        }
-       cts_stmt_finalize(stmt);
+       ctsvc_stmt_finalize(stmt);
 
        count = g_slist_length(list);
        if (count <= 0)
@@ -202,7 +193,7 @@ static int __ctsvc_server_bg_contact_delete_step3(__ctsvc_delete_data_s* data)
                        CTS_ERR("DB failed");
                        ctsvc_end_trans(false);
                        g_slist_free(list);
-                       return CONTACTS_ERROR_DB;
+                       return ret;
                }
                cursor = g_slist_next(cursor);
        }
@@ -226,7 +217,7 @@ static int __ctsvc_server_bg_contact_delete_step4(__ctsvc_delete_data_s* data)
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("DB failed");
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        snprintf(query, sizeof(query), "DELETE FROM "CTS_TABLE_CONTACTS" WHERE contact_id = %d",
@@ -235,7 +226,7 @@ static int __ctsvc_server_bg_contact_delete_step4(__ctsvc_delete_data_s* data)
        if (CONTACTS_ERROR_NONE != ret) {
                CTS_ERR("DB failed");
                ctsvc_end_trans(false);
-               return CONTACTS_ERROR_DB;
+               return ret;
        }
 
        ret = ctsvc_end_trans(true);
@@ -292,15 +283,19 @@ static bool  __ctsvc_server_db_delete_run(__ctsvc_delete_data_s* data)
 
        switch (data->step) {
                case STEP_1:
+                       // get deleted contact id list
                        ret = __ctsvc_server_bg_contact_delete_step1(data);
                        break;
                case STEP_2:
+                       // delete data of current contact id (MAX CTSVC_SERVER_BG_DELETE_COUNT)
                        ret = __ctsvc_server_bg_contact_delete_step2(data);
                        break;
                case STEP_3:
+                       // delete activity of current contact id (MAX CTSVC_SERVER_BG_DELETE_COUNT each time)
                        ret = __ctsvc_server_bg_contact_delete_step3(data);
                        break;
                case STEP_4:
+                       // delete search index of current contact id
                        ret = __ctsvc_server_bg_contact_delete_step4(data);
                        break;
                default:
@@ -387,6 +382,7 @@ static void __ctsvc_server_contact_deleted_cb(const char *view_uri, void *data)
 static bool __ctsvc_server_account_delete_cb(const char* event_type, int account_id, void* user_data)
 {
        CTS_FN_CALL;
+       CTS_INFO("event_type : %s, account_id : %d", event_type, account_id);
        if (strcmp(event_type, ACCOUNT_NOTI_NAME_DELETE) == 0)
                ctsvc_addressbook_delete(account_id);
        return true;