Update change log and spec for wrt-plugins-tizen_0.2.71

[profile/ivi/wrt-plugins-tizen.git] / src / platform / Tizen / Contact / query-svc / query-utility.c

diff --git a/src/platform/Tizen/Contact/query-svc/query-utility.c b/src/platform/Tizen/Contact/query-svc/query-utility.c
index c22db1c..38ae0fb 100755 (executable)
--- a/src/platform/Tizen/Contact/query-svc/query-utility.c
+++ b/src/platform/Tizen/Contact/query-svc/query-utility.c
@@ -31,7 +31,7 @@
 #include <unicode/ustring.h>
 
 static int transaction_count = 0;
-static int db_connnect_count = 0;
+static int db_connnect_count = 1;
 
 clock_t
 _get_clock()
@@ -229,7 +229,7 @@ stmt _contact_query_prepare(char *query)
        stmt pStmt = NULL;
 
        ADVANCED_SVC_TRACE("query : %s !!!!\n", query);
-//     printf("\nquery : %s !!!!\n", query);
+       printf("\nquery : %s !!!!\n", query);
 
        rc = sqlite3_prepare_v2(g_hDBCt, query, strlen(query), &pStmt, NULL);
        if(SQLITE_OK != rc)
@@ -324,9 +324,11 @@ predefine_datatype _convert_attribute_to_mimetype_id(contact_attribute_e attribu
 //             case ORGANIZATION_LOGO_URI:
                        data_type = DATATYPE_ORGANIZATION;
                        break;
+               case CONTACT_NOTE:
+                       data_type = DATATYPE_NOTE;
+                       break;
                case CONTACT_IS_FAVORITE:
                case CONTACT_RINGTONE:
-               case CONTACT_NOTE:
 //             case CONTACT_READ_ONLY:
 //             case CONTACT_SEND_TO_VOICE_MAIL:
                case CONTACT_LAST_UPDATED_TIME_STAMP:
@@ -472,7 +474,7 @@ char* _convert_attribute_to_condition_column_name(contact_attribute_e attribute)
                        field_name = condition_field_key[FIELD_RINGTONE];
                        break;
                case CONTACT_NOTE :
-                       field_name = condition_field_key[FIELD_NOTE];
+                       field_name = condition_field_key[FIELD_DATA3];
                        break;
                case CONTACT_ID :
                        field_name = condition_field_key[FIELD_DATA_CONTACT_ID];
@@ -523,46 +525,46 @@ char* _convert_attribute_to_condition_column_name(contact_attribute_e attribute)
                        field_name = condition_field_key[FIELD_DATA7];
                        break;
                case NICKNAME_NAME:
-                       field_name = condition_field_key[FIELD_DATA2];
+                       field_name = condition_field_key[FIELD_DATA3];
                        break;
                case NUMBER_ADDRESS:
-                       field_name = condition_field_key[FIELD_DATA2];
+                       field_name = condition_field_key[FIELD_DATA3];
                        break;
                case NUMBER_TYPES:
                        field_name = condition_field_key[FIELD_DATA1];
                        break;
                case EMAIL_ADDRESS:
-                       field_name = condition_field_key[FIELD_DATA2];
+                       field_name = condition_field_key[FIELD_DATA3];
                        break;
                case EMAIL_TYPE:
                        field_name = condition_field_key[FIELD_DATA1];
                        break;
                case URL_ADDRESS:
-                       field_name = condition_field_key[FIELD_DATA2];
+                       field_name = condition_field_key[FIELD_DATA3];
                        break;
                case URL_TYPE:
                        field_name = condition_field_key[FIELD_DATA1];
                        break;
                case ADDRESS_COUNTRY:
-                       field_name = condition_field_key[FIELD_DATA8];
+                       field_name = condition_field_key[FIELD_DATA9];
                        break;
                case ADDRESS_REGION:
-                       field_name = condition_field_key[FIELD_DATA4];
+                       field_name = condition_field_key[FIELD_DATA5];
                        break;
 //             case ADDRESS_COUNTY:
 //                     field_name = condition_field_key[FIELD_DATA5];
 //                     break;
                case ADDRESS_CITY:
-                       field_name = condition_field_key[FIELD_DATA5];
+                       field_name = condition_field_key[FIELD_DATA6];
                        break;
                case ADDRESS_STREET:
-                       field_name = condition_field_key[FIELD_DATA6];
+                       field_name = condition_field_key[FIELD_DATA7];
                        break;
                case ADDRESS_POSTAL_CODE:
-                       field_name = condition_field_key[FIELD_DATA3];
+                       field_name = condition_field_key[FIELD_DATA4];
                        break;
                case ADDRESS_ADDITIONAL:
-                       field_name = condition_field_key[FIELD_DATA7];
+                       field_name = condition_field_key[FIELD_DATA8];
                        break;
                case ADDRESS_TYPE:
                        field_name = condition_field_key[FIELD_DATA1];
@@ -574,25 +576,25 @@ char* _convert_attribute_to_condition_column_name(contact_attribute_e attribute)
                        field_name = condition_field_key[FIELD_DATA1];
                        break;
                case EVENT_DATE:
-                       field_name = condition_field_key[FIELD_DATA2];
+                       field_name = condition_field_key[FIELD_DATA3];
                        break;
 //             case ANNIVERSARY_LABEL:
 //                     field_name = condition_field_key[FIELD_DATA2];
 //                     break;
                case ORGANIZATION_NAME:
-                       field_name = condition_field_key[FIELD_DATA2];
+                       field_name = condition_field_key[FIELD_DATA3];
                        break;
                case ORGANIZATION_DEPARTMENT:
-                       field_name = condition_field_key[FIELD_DATA3];
+                       field_name = condition_field_key[FIELD_DATA4];
                        break;
 //             case ORGANIZATION_OFFICE:
 //                     field_name = condition_field_key[FIELD_DATA3];
 //                     break;
                case ORGANIZATION_TITLE:
-                       field_name = condition_field_key[FIELD_DATA4];
+                       field_name = condition_field_key[FIELD_DATA5];
                        break;
                case ORGANIZATION_ROLE:
-                       field_name = condition_field_key[FIELD_DATA5];
+                       field_name = condition_field_key[FIELD_DATA6];
                        break;
 //             case ORGANIZATION_LOGO_URI:
 //                     field_name = condition_field_key[FIELD_DATA6];
@@ -722,7 +724,7 @@ char* _convert_attribute_to_column_name(contact_attribute_e attribute)
                        field_name = field_key[FIELD_RINGTONE];
                        break;
                case CONTACT_NOTE :
-                       field_name = field_key[FIELD_NOTE];
+                       field_name = field_key[FIELD_DATA3];
                        break;
                case CONTACT_UID :
                        field_name = field_key[FIELD_UID];
@@ -775,46 +777,46 @@ char* _convert_attribute_to_column_name(contact_attribute_e attribute)
                        field_name = field_key[FIELD_DATA7];
                        break;
                case NICKNAME_NAME:
-                       field_name = field_key[FIELD_DATA2];
+                       field_name = field_key[FIELD_DATA3];
                        break;
                case NUMBER_ADDRESS:
-                       field_name = field_key[FIELD_DATA2];
+                       field_name = field_key[FIELD_DATA3];
                        break;
                case NUMBER_TYPES:
                        field_name = field_key[FIELD_DATA1];
                        break;
                case EMAIL_ADDRESS:
-                       field_name = field_key[FIELD_DATA1];
+                       field_name = field_key[FIELD_DATA3];
                        break;
                case EMAIL_TYPE:
                        field_name = field_key[FIELD_DATA2];
                        break;
                case URL_ADDRESS:
-                       field_name = field_key[FIELD_DATA1];
+                       field_name = field_key[FIELD_DATA3];
                        break;
                case URL_TYPE:
-                       field_name = field_key[FIELD_DATA2];
+                       field_name = field_key[FIELD_DATA1];
                        break;
                case ADDRESS_COUNTRY:
-                       field_name = field_key[FIELD_DATA8];
+                       field_name = field_key[FIELD_DATA9];
                        break;
                case ADDRESS_REGION:
-                       field_name = field_key[FIELD_DATA4];
+                       field_name = field_key[FIELD_DATA5];
                        break;
 //             case ADDRESS_COUNTY:
 //                     field_name = field_key[FIELD_DATA5];
 //                     break;
                case ADDRESS_CITY:
-                       field_name = field_key[FIELD_DATA5];
+                       field_name = field_key[FIELD_DATA6];
                        break;
                case ADDRESS_STREET:
-                       field_name = field_key[FIELD_DATA6];
+                       field_name = field_key[FIELD_DATA7];
                        break;
                case ADDRESS_POSTAL_CODE:
-                       field_name = field_key[FIELD_DATA3];
+                       field_name = field_key[FIELD_DATA4];
                        break;
                case ADDRESS_ADDITIONAL:
-                       field_name = field_key[FIELD_DATA7];
+                       field_name = field_key[FIELD_DATA8];
                        break;
                case ADDRESS_TYPE:
                        field_name = field_key[FIELD_DATA1];
@@ -826,25 +828,25 @@ char* _convert_attribute_to_column_name(contact_attribute_e attribute)
                        field_name = field_key[FIELD_DATA1];
                        break;
                case EVENT_DATE:
-                       field_name = field_key[FIELD_DATA2];
+                       field_name = field_key[FIELD_DATA3];
                        break;
 //             case ANNIVERSARY_LABEL:
 //                     field_name = field_key[FIELD_DATA2];
 //                     break;
                case ORGANIZATION_NAME:
-                       field_name = field_key[FIELD_DATA2];
+                       field_name = field_key[FIELD_DATA3];
                        break;
                case ORGANIZATION_DEPARTMENT:
-                       field_name = field_key[FIELD_DATA3];
+                       field_name = field_key[FIELD_DATA4];
                        break;
 //             case ORGANIZATION_OFFICE:
 //                     field_name = field_key[FIELD_DATA3];
 //                     break;
                case ORGANIZATION_TITLE:
-                       field_name = field_key[FIELD_DATA4];
+                       field_name = field_key[FIELD_DATA5];
                        break;
                case ORGANIZATION_ROLE:
-                       field_name = field_key[FIELD_DATA5];
+                       field_name = field_key[FIELD_DATA6];
                        break;
 //             case ORGANIZATION_LOGO_URI:
 //                     field_name = field_key[FIELD_DATA6];
@@ -957,7 +959,6 @@ char* _convert_attribute_to_table_name(contact_attribute_e attribute)
                case CONTACT_LAST_UPDATED_TIME_STAMP:
                case CONTACT_IS_FAVORITE:
                case CONTACT_RINGTONE :
-               case CONTACT_NOTE :
                case ACCOUNT_ID:
                case CONTACT_UID:
                {
@@ -998,6 +999,7 @@ char* _convert_attribute_to_table_name(contact_attribute_e attribute)
                case ORGANIZATION_TITLE:
                case ORGANIZATION_ROLE:
 //             case ORGANIZATION_LOGO_URI:
+               case CONTACT_NOTE :
                {
                        table_name = table_key[TABLE_DATA];
                }
@@ -1437,10 +1439,10 @@ db_datatype _convert_datatype_to_db_type(predefine_datatype datatype)
                case DATATYPE_ANNIVERSARY:
                        db_datatype_id = DB_DATATYPE_EVENT;
                        break;
-/*
-               case DATATYPE_LBS_INFO:
-                       db_datatype_id = DB_DATATYPE_LBS_INFO;
+               case DATATYPE_NOTE:
+                       db_datatype_id = DB_DATATYPE_NOTE;
                        break;
+/*
                case DATATYPE_CATEGORY:
                        db_datatype_id = DB_DATATYPE_CATEGORY;
                        break;
@@ -1851,10 +1853,10 @@ int _convert_type_string_to_int(contact_attribute_e attribute, const char* value
                        integer_value = (int)strtol(value, &end_ptr, 0);
                        if(errno == ERANGE || end_ptr == value)
                        {
-                               ADVANCED_SVC_TRACE("contact_id is wrong : %s", contact_id);
+//                             ADVANCED_SVC_TRACE("contact_id is wrong : %s", contact_id);
                                return 0;
                        }
-                       ADVANCED_SVC_TRACE("id : %d", id);
+                       ADVANCED_SVC_TRACE("id : %d", integer_value);
                }
                        break;
                case CONTACT_LAST_UPDATED_TIME_STAMP :
@@ -1864,7 +1866,7 @@ int _convert_type_string_to_int(contact_attribute_e attribute, const char* value
                        integer_value = (int)strtol(value, &end_ptr, 0);
                        if(errno == ERANGE || end_ptr == value)
                        {
-                               ADVANCED_SVC_TRACE("contact_id is wrong : %s", contact_id);
+//                             ADVANCED_SVC_TRACE("contact_id is wrong : %s", contact_id);
                                return 0;
                        }
                }