modifiy sip data contents

data1:type, data2:label, data3:address

Change-Id: I1ae43ab7da817097400b0d663275a350c9508730

diff --git a/common/ctsvc_view.c b/common/ctsvc_view.c
index 4d32e67..0751395 100644 (file)
--- a/common/ctsvc_view.c
+++ b/common/ctsvc_view.c
@@ -664,9 +664,9 @@ EXPORT_API const _contacts_sip_property_ids _contacts_sip = {
        ._uri           = CTSVC_VIEW_URI_SIP,
        .id         = CTSVC_PROPERTY_SIP_ID,
        .contact_id     = CTSVC_PROPERTY_SIP_CONTACT_ID,
-       .address    = CTSVC_PROPERTY_SIP_ADDRESS,
        .type           = CTSVC_PROPERTY_SIP_TYPE,
        .label          = CTSVC_PROPERTY_SIP_LABEL,
+       .address    = CTSVC_PROPERTY_SIP_ADDRESS,
 };
 
 #ifdef ENABLE_LOG_FEATURE
@@ -919,9 +919,9 @@ const property_info_s __property_extension[] = {
 const property_info_s __property_sip[] = {
        {CTSVC_PROPERTY_SIP_ID,             CTSVC_SEARCH_PROPERTY_ALL,  "id"},
        {CTSVC_PROPERTY_SIP_CONTACT_ID,     CTSVC_SEARCH_PROPERTY_ALL,  "contact_id"},
-       {CTSVC_PROPERTY_SIP_ADDRESS,        CTSVC_SEARCH_PROPERTY_ALL,  "data1"},
-       {CTSVC_PROPERTY_SIP_TYPE,                       CTSVC_SEARCH_PROPERTY_ALL,      "data2"},
-       {CTSVC_PROPERTY_SIP_LABEL,          CTSVC_SEARCH_PROPERTY_ALL,  "data3"},
+       {CTSVC_PROPERTY_SIP_TYPE,                       CTSVC_SEARCH_PROPERTY_ALL,      "data1"},
+       {CTSVC_PROPERTY_SIP_LABEL,          CTSVC_SEARCH_PROPERTY_ALL,  "data2"},
+       {CTSVC_PROPERTY_SIP_ADDRESS,        CTSVC_SEARCH_PROPERTY_ALL,  "data3"},
 };
 
 const property_info_s __property_contact[] = {

diff --git a/common/ctsvc_view.h b/common/ctsvc_view.h
index 9e3f8bb..f98904a 100644 (file)
--- a/common/ctsvc_view.h
+++ b/common/ctsvc_view.h
@@ -465,9 +465,9 @@ typedef enum {
        /* contact sip */
        CTSVC_PROPERTY_SIP_ID = (CTSVC_PROPERTY_SIP | CTSVC_VIEW_DATA_TYPE_INT | CTSVC_READ_ONLY_PROPERTY),
        CTSVC_PROPERTY_SIP_CONTACT_ID = (CTSVC_PROPERTY_SIP | CTSVC_VIEW_DATA_TYPE_INT) +1,
-       CTSVC_PROPERTY_SIP_ADDRESS = (CTSVC_PROPERTY_SIP | CTSVC_VIEW_DATA_TYPE_STR) +2,
-       CTSVC_PROPERTY_SIP_TYPE = (CTSVC_PROPERTY_SIP | CTSVC_VIEW_DATA_TYPE_INT) +3,
-       CTSVC_PROPERTY_SIP_LABEL = (CTSVC_PROPERTY_SIP | CTSVC_VIEW_DATA_TYPE_STR) +4,
+       CTSVC_PROPERTY_SIP_TYPE = (CTSVC_PROPERTY_SIP | CTSVC_VIEW_DATA_TYPE_INT) +2,
+       CTSVC_PROPERTY_SIP_LABEL = (CTSVC_PROPERTY_SIP | CTSVC_VIEW_DATA_TYPE_STR) +3,
+       CTSVC_PROPERTY_SIP_ADDRESS = (CTSVC_PROPERTY_SIP | CTSVC_VIEW_DATA_TYPE_STR) +4,
 
 } ctsvc_property_ids_e;
 

diff --git a/server/db/ctsvc_db_plugin_sip_helper.c b/server/db/ctsvc_db_plugin_sip_helper.c
index de35ce8..93221a7 100644 (file)
--- a/server/db/ctsvc_db_plugin_sip_helper.c
+++ b/server/db/ctsvc_db_plugin_sip_helper.c
@@ -27,6 +27,11 @@
 #include "ctsvc_record.h"
 #include "ctsvc_notification.h"
 
+/* in sip
+ * data1 : type
+ * data2 : label
+ * data3 : address
+ */
 int ctsvc_db_sip_insert(contacts_record_h record, int contact_id, bool is_my_profile, int *id)
 {
        int ret;
@@ -42,15 +47,15 @@ int ctsvc_db_sip_insert(contacts_record_h record, int contact_id, bool is_my_pro
 
        snprintf(query, sizeof(query),
                "INSERT INTO "CTS_TABLE_DATA"(contact_id, is_my_profile, datatype, data1, data2, data3) "
-                                                                       "VALUES(%d, %d, %d, ?, %d, ?)",
+                                                                       "VALUES(%d, %d, %d, %d, ?, ?)",
                        contact_id, is_my_profile, CONTACTS_DATA_TYPE_SIP, sip->type);
        ret = ctsvc_query_prepare(query, &stmt);
        RETVM_IF(NULL == stmt, ret, "DB error : ctsvc_query_prepare() Fail(%d)", ret);
 
-       if (sip->address)
-               ctsvc_stmt_bind_text(stmt, 1, sip->address);
        if (sip->label)
-               ctsvc_stmt_bind_text(stmt, 2, sip->label);
+               ctsvc_stmt_bind_text(stmt, 1, sip->label);
+       if (sip->address)
+               ctsvc_stmt_bind_text(stmt, 2, sip->address);
 
        ret = ctsvc_stmt_step(stmt);
        if (CONTACTS_ERROR_NONE != ret) {
@@ -85,11 +90,11 @@ int ctsvc_db_sip_get_value_from_stmt(cts_stmt stmt, contacts_record_h *record, i
        sip->id = ctsvc_stmt_get_int(stmt, start_count++);
        sip->contact_id = ctsvc_stmt_get_int(stmt, start_count++);
        start_count++; /* is_default */
-       temp = ctsvc_stmt_get_text(stmt, start_count++);
-       sip->address = SAFE_STRDUP(temp);
        sip->type = ctsvc_stmt_get_int(stmt, start_count++);
        temp = ctsvc_stmt_get_text(stmt, start_count++);
        sip->label = SAFE_STRDUP(temp);
+       temp = ctsvc_stmt_get_text(stmt, start_count++);
+       sip->address = SAFE_STRDUP(temp);
 
        *record = (contacts_record_h)sip;