Removed contacts_db_delete_record and added DeleteContactRecord in AddressbookUtil...

[framework/osp/social.git] / src / FScl_AddressbookManagerImpl.cpp

diff --git a/src/FScl_AddressbookManagerImpl.cpp b/src/FScl_AddressbookManagerImpl.cpp
index f0f63f8..3698b66 100644 (file)
--- a/src/FScl_AddressbookManagerImpl.cpp
+++ b/src/FScl_AddressbookManagerImpl.cpp
@@ -249,13 +249,10 @@ _AddressbookManagerImpl::CreateAddressbookN(AccountId accountId, const String& n
 result
 _AddressbookManagerImpl::DeleteAddressbook(AddressbookId addressbookId)
 {
-       SysTryReturn(NID_SCL, addressbookId > 0, E_INVALID_ARG, E_INVALID_ARG, "[%s] Invalid argument is used. The addressbook ID is invalid or the default addressbook ID.", GetErrorMessage(E_INVALID_ARG));
+       SysTryReturn(NID_SCL, addressbookId > 0, E_INVALID_ARG, E_INVALID_ARG, "[%s] Invalid argument used.The addressbook ID is invalid or the default addressbook ID.", GetErrorMessage(E_INVALID_ARG));
        SysTryReturn(NID_SCL, _ContactDbConnector::EnsureDbConnection() == E_SUCCESS, GetLastResult(), GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-       int ret = contacts_db_delete_record(_contacts_address_book._uri, addressbookId);
-       SysTryReturn(NID_SCL, ret != CONTACTS_ERROR_OUT_OF_MEMORY, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
-       SysTryReturn(NID_SCL, ret != CONTACTS_ERROR_NO_DATA, E_OBJ_NOT_FOUND, E_OBJ_NOT_FOUND, "[%s] The addressbook is not found.", GetErrorMessage(E_OBJ_NOT_FOUND));
-//     SysTryReturnResult(NID_SCL, ret == CONTACTS_ERROR_NONE, E_OPERATION_FAILED, "Failed to delete an addressbook.(%d)", ret); // temp
+       result r = _AddressbookUtil::DeleteContactRecord(_contacts_address_book._uri, addressbookId);
+       SysTryReturn(NID_SCL, !IsFailed(r), r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        return E_SUCCESS;
 }
@@ -1587,10 +1584,12 @@ _AddressbookManagerImpl::SearchN(const AddressbookFilter& filter, unsigned long
                        {
                                __Filter<__ContactsAddressbook> mainFilter;
                                mainFilter.Construct();
-
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(abFilter);
+                               if (abFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(abFilter);
+                               }
 
                                __Query<__ContactsAddressbook> query;
                                query.Construct();
@@ -1641,10 +1640,12 @@ _AddressbookManagerImpl::SearchN(const AddressbookFilter& filter, unsigned long
                        {
                                __Filter<__ContactsPersonGroupRel> mainFilter;
                                mainFilter.Construct();
-
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(personFilter);
+                               if (personFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(personFilter);
+                               }
 
                                __Query<__ContactsPersonGroupRel> query;
                                query.Construct();
@@ -1687,10 +1688,12 @@ _AddressbookManagerImpl::SearchN(const AddressbookFilter& filter, unsigned long
                        {
                                __Filter<__ContactsContact> mainFilter;
                                mainFilter.Construct();
-
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(contactFilter);
+                               if (contactFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(contactFilter);
+                               }
 
                                __Query<__ContactsContact> query;
                                query.Construct();
@@ -1730,10 +1733,12 @@ _AddressbookManagerImpl::SearchN(const AddressbookFilter& filter, unsigned long
                        {
                                __Filter<__ContactsGroup> mainFilter;
                                mainFilter.Construct();
-
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(groupFilter);
+                               if (groupFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(groupFilter);
+                               }
 
                                __Query<__ContactsGroup> query;
                                query.Construct();
@@ -1772,10 +1777,12 @@ _AddressbookManagerImpl::SearchN(const AddressbookFilter& filter, unsigned long
                        {
                                __Filter<__ContactsContactNumber> mainFilter;
                                mainFilter.Construct();
-
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(numberFilter);
+                               if (numberFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(numberFilter);
+                               }
 
                                __Query<__ContactsContactNumber> query;
                                query.Construct();
@@ -1814,10 +1821,12 @@ _AddressbookManagerImpl::SearchN(const AddressbookFilter& filter, unsigned long
                        {
                                __Filter<__ContactsContactEmail> mainFilter;
                                mainFilter.Construct();
-
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(emailFilter);
+                               if (emailFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(emailFilter);
+                               }
 
                                __Query<__ContactsContactEmail> query;
                                query.Construct();
@@ -1878,8 +1887,11 @@ _AddressbookManagerImpl::GetMatchedItemCount(const AddressbookFilter& filter)
                                __Filter<__ContactsAddressbook> mainFilter;
                                mainFilter.Construct();
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(abFilter);
+                               if (abFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(abFilter);
+                               }
 
                                count = _AddressbookUtil::GetMatchedItemCountWithFilter<__ContactsAddressbook>(mainFilter.Get());
                        }
@@ -1901,8 +1913,11 @@ _AddressbookManagerImpl::GetMatchedItemCount(const AddressbookFilter& filter)
                                __Filter<__ContactsPersonGroupRel> mainFilter;
                                mainFilter.Construct();
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(personFilter);
+                               if (personFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(personFilter);
+                               }
 
                                unsigned int propertyIds[] = { _contacts_person_grouprel.person_id };
 
@@ -1942,8 +1957,11 @@ _AddressbookManagerImpl::GetMatchedItemCount(const AddressbookFilter& filter)
                                __Filter<__ContactsContact> mainFilter;
                                mainFilter.Construct();
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(contactFilter);
+                               if (contactFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(contactFilter);
+                               }
 
                                count = _AddressbookUtil::GetMatchedItemCountWithFilter<__ContactsContact>(mainFilter.Get());
                        }
@@ -1965,8 +1983,11 @@ _AddressbookManagerImpl::GetMatchedItemCount(const AddressbookFilter& filter)
                                __Filter<__ContactsGroup> mainFilter;
                                mainFilter.Construct();
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(groupFilter);
+                               if (groupFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(groupFilter);
+                               }
 
                                count = _AddressbookUtil::GetMatchedItemCountWithFilter<__ContactsGroup>(mainFilter.Get());
                        }
@@ -1988,8 +2009,11 @@ _AddressbookManagerImpl::GetMatchedItemCount(const AddressbookFilter& filter)
                                __Filter<__ContactsContactNumber> mainFilter;
                                mainFilter.Construct();
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(numberFilter);
+                               if (numberFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(numberFilter);
+                               }
 
                                count = _AddressbookUtil::GetMatchedItemCountWithFilter<__ContactsContactNumber>(mainFilter.Get());
                        }
@@ -2011,8 +2035,11 @@ _AddressbookManagerImpl::GetMatchedItemCount(const AddressbookFilter& filter)
                                __Filter<__ContactsContactEmail> mainFilter;
                                mainFilter.Construct();
                                mainFilter.AddFilter(*pRwAbFilter);
-                               mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
-                               mainFilter.AddFilter(emailFilter);
+                               if (emailFilter.Get() != null)
+                               {
+                                       mainFilter.AddOperator(CONTACTS_FILTER_OPERATOR_AND);
+                                       mainFilter.AddFilter(emailFilter);
+                               }
 
                                count = _AddressbookUtil::GetMatchedItemCountWithFilter<__ContactsContactEmail>(mainFilter.Get());
                        }