From d253f051d828e85537862eb26fb0275dfcbaa1d5 Mon Sep 17 00:00:00 2001 From: Seokpil Park Date: Wed, 21 Aug 2013 15:06:36 +0900 Subject: [PATCH] [content] Fix a TC fail Change-Id: I4d290cc84bbb48a844a447f8d08561e9050c8cd3 Signed-off-by: Seokpil Park --- packaging/osp-content.spec | 4 ++++ src/FCnt_ContentSearchImpl.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packaging/osp-content.spec b/packaging/osp-content.spec index c84aa2d..8b5b58b 100644 --- a/packaging/osp-content.spec +++ b/packaging/osp-content.spec @@ -86,8 +86,12 @@ osp content library (DEV) %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %ifarch %{ix86} +%if 0%{?simulator} CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} %else +CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ " cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%endif +%else CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} %endif diff --git a/src/FCnt_ContentSearchImpl.cpp b/src/FCnt_ContentSearchImpl.cpp index 82e616d..a32f1ba 100644 --- a/src/FCnt_ContentSearchImpl.cpp +++ b/src/FCnt_ContentSearchImpl.cpp @@ -733,7 +733,8 @@ _ContentSearchImpl::SearchN(int pageNo, int countPerPage, int& totalPageCount, i totalPageCount = (totalCount / countPerPage) + 1; } - SysTryReturn(NID_CNT, ((pageNo >= 1) && (pageNo <= totalPageCount)) , NULL, E_INVALID_ARG, "[E_INVALID_ARG] (pageNo < 1) || (pageNo > totalPageCount)."); + SysTryReturn(NID_CNT, ((pageNo >= 1) && (pageNo <= totalPageCount)) , NULL, E_INVALID_ARG, + "[%s] Failed to perform SearchN operation. pageNo : %d, totalPageCount : %d.", GetErrorMessage(r), pageNo, totalPageCount); offset = (pageNo * countPerPage) - countPerPage; @@ -1295,7 +1296,8 @@ _ContentSearchImpl::FillColumnsList(int pageNo, int countPerPage, int& totalPage totalPageCount = (totalCount / countPerPage) + 1; } - SysTryReturnResult(NID_CNT, ((pageNo >= 1) && (pageNo <= totalPageCount)) , r, "(pageNo < 1) || (pageNo > totalPageCount)."); + SysTryReturnResult(NID_CNT, ((pageNo >= 1) && (pageNo <= totalPageCount)), E_INVALID_ARG, + "Failed to perform FillColumnsList operation. pageNo : %d, totalPageCount : %d.", pageNo, totalPageCount); offset = (pageNo * countPerPage) - countPerPage; -- 2.7.4