From: hs321.lee <hs321.lee@samsung.com>
Date: Mon, 24 Jun 2013 10:35:54 +0000 (+0900)
Subject: Fix Addressbook TC Fails
X-Git-Tag: submit/tizen_2.2/20130714.153047~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19fafb6b0e299e2b95fc38c9a3dce9439018d398;p=framework%2Fosp%2Fsocial.git

Fix Addressbook TC Fails

Change-Id: I53ea9eb695c381a99e27d17660a6437040452e7b
Signed-off-by: hs321.lee <hs321.lee@samsung.com>
---

diff --git a/src/FScl_AddressbookManagerImpl.cpp b/src/FScl_AddressbookManagerImpl.cpp
index f0f63f8..9d61c18 100644
--- a/src/FScl_AddressbookManagerImpl.cpp
+++ b/src/FScl_AddressbookManagerImpl.cpp
@@ -1587,10 +1587,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 +1643,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 +1691,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 +1736,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 +1780,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 +1824,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 +1890,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 +1916,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 +1960,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 +1986,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 +2012,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 +2038,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());
 			}
diff --git a/src/FScl_AddressbookUtil.h b/src/FScl_AddressbookUtil.h
index d2e53d2..a09076e 100644
--- a/src/FScl_AddressbookUtil.h
+++ b/src/FScl_AddressbookUtil.h
@@ -194,17 +194,10 @@ public:
 
 	result Construct(contacts_filter_h filterHandle)
 	{
-		if (filterHandle != null)
-		{
-			__filterHandle = filterHandle;
-			__destroyFilterHandle = false;
-		}
-		else
-		{
-			Construct();
-		}
-
-		return true;
+		__filterHandle = filterHandle;
+		__destroyFilterHandle = false;
+	
+		return E_SUCCESS;
 	}
 
 	contacts_filter_h Get(void) const
@@ -800,7 +793,7 @@ public:
 			count = _AddressbookUtil::GetCountWithQuery(query);
 		}
 		else
-		{
+		{	
 			__Query<__View> query;
 			query.Construct();