Modify PrivacyInfo getter apis

Change-Id: I325c951e357e3780e5237b902241da91523ff4c4
Signed-off-by: Hyunwoo Kim <hwlove.kim@samsung.com>

diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index d495d2e..002111c
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -39,11 +39,11 @@ ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
 
 TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
 
 
 TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
 

-SET_TARGET_PROPERTIES(${fw_name}
-     PROPERTIES
-     VERSION ${FULLVER}
-     SOVERSION ${MAJORVER}
-     CLEAN_DIRECT_OUTPUT 1
+SET_TARGET_PROPERTIES(${fw_name} 
+    PROPERTIES 
+    SOVERSION ${API_VERSION} 
+    VERSION ${VERSION} 
+    CLEAN_DIRECT_OUTPUT 1

 )
 
 INSTALL(TARGETS ${fw_name} DESTINATION ../lib)
 )
 
 INSTALL(TARGETS ${fw_name} DESTINATION ../lib)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 4c6fc93..43815e1 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -6,10 +6,6 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 SET(EXEC_PREFIX "\${prefix}")
 SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")

-SET(VERSION 0.0)
-
-SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.0.1")

 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED dlog sqlite3 dbus-1 dbus-glib-1)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED dlog sqlite3 dbus-1 dbus-glib-1)


@@ -72,7 +68,7 @@ ADD_DEFINITIONS("-DLOG_TAG=\"PRIVACY-MANAGER-CLIENT\"")
 ADD_LIBRARY(privacy-manager-client SHARED ${PRIVACY_MANAGER_CLIENT_SOURCES})
 TARGET_LINK_LIBRARIES(privacy-manager-client ${pkgs_LDFLAGS} ${pkgs_LIBRARIES})
 SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES COMPILE_FLAGS "${PRIVACY_MANAGER_CLIENT_CFLAGS}")
 ADD_LIBRARY(privacy-manager-client SHARED ${PRIVACY_MANAGER_CLIENT_SOURCES})
 TARGET_LINK_LIBRARIES(privacy-manager-client ${pkgs_LDFLAGS} ${pkgs_LIBRARIES})
 SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES COMPILE_FLAGS "${PRIVACY_MANAGER_CLIENT_CFLAGS}")

-SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES SOVERSION ${API_VERSION})

 SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES VERSION ${VERSION})
 ###################################################################################################
 
 SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES VERSION ${VERSION})
 ###################################################################################################
 

diff --git a/client/src/PrivacyChecker.cpp b/client/src/PrivacyChecker.cpp
index d42a4a2..3c46c26 100644 (file)
--- a/client/src/PrivacyChecker.cpp
+++ b/client/src/PrivacyChecker.cpp
@@ -264,7 +264,7 @@ PrivacyChecker::check(const std::string pkgId, const std::string privacyId)
        {\r
                std::map < std::string, bool > pkgCacheMap;\r
                res = updateCache(pkgId, pkgCacheMap);\r
        {\r
                std::map < std::string, bool > pkgCacheMap;\r
                res = updateCache(pkgId, pkgCacheMap);\r

-               TryReturn( res == PRIV_MGR_ERROR_SUCCESS, PRIV_MGR_ERROR_DB_ERROR, , "sqlite3_bind_text : %d", res);\r
+               TryReturn( res == PRIV_MGR_ERROR_SUCCESS, PRIV_MGR_ERROR_DB_ERROR, , "updateCache : %d", res);\r

 \r
                m_privacyInfoCache.insert( std::map < std::string, std::map < std::string, bool > >::value_type(std::string(pkgId), pkgCacheMap));\r
                iter = m_privacyInfoCache.find(pkgId);\r
 \r
                m_privacyInfoCache.insert( std::map < std::string, std::map < std::string, bool > >::value_type(std::string(pkgId), pkgCacheMap));\r
                iter = m_privacyInfoCache.find(pkgId);\r

diff --git a/client/src/privacy_info_client.cpp b/client/src/privacy_info_client.cpp
index 855fa32..4b1141a 100644 (file)
--- a/client/src/privacy_info_client.cpp
+++ b/client/src/privacy_info_client.cpp
@@ -47,10 +47,14 @@ int privacy_info_client_get_privacy_id(privacy_info_client_s* privacy_info, char
 int privacy_info_client_get_privacy_display_name(privacy_info_client_s* privacy_info, char **name)\r
 {\r
        // TODO: Modify to use STMS\r
 int privacy_info_client_get_privacy_display_name(privacy_info_client_s* privacy_info, char **name)\r
 {\r
        // TODO: Modify to use STMS\r

-       int size = strlen(privacy_info->privacy_id);\r
+       std::string temp = std::string(privacy_info->privacy_id);\r
+       int startIndex = temp.find_last_of("/");\r
+       std::string displayName = temp.substr(startIndex + 1, temp.size());\r
+\r
+       int size = strlen(displayName.c_str());\r

        *name = (char*) calloc(1, size + 1);\r
 \r
        *name = (char*) calloc(1, size + 1);\r
 \r

-       memcpy (*name, privacy_info->privacy_id, size);\r
+       memcpy (*name, displayName.c_str(), size);\r

 \r
        return PRIV_MGR_ERROR_SUCCESS;\r
 }\r
 \r
        return PRIV_MGR_ERROR_SUCCESS;\r
 }\r


@@ -58,10 +62,11 @@ int privacy_info_client_get_privacy_display_name(privacy_info_client_s* privacy_
 int privacy_info_client_get_privacy_description(privacy_info_client_s* privacy_info, char **description)\r
 {\r
        // TODO: Modify to use STMS\r
 int privacy_info_client_get_privacy_description(privacy_info_client_s* privacy_info, char **description)\r
 {\r
        // TODO: Modify to use STMS\r

-       int size = strlen(privacy_info->privacy_id);\r
+       char tempDesc[] = "Undefined";\r
+       int size = strlen(tempDesc);\r

        *description = (char*) calloc(1, size + 1);\r
 \r
        *description = (char*) calloc(1, size + 1);\r
 \r

-       memcpy (*description, privacy_info->privacy_id, size);\r
+       memcpy (*description, tempDesc, size);\r

 \r
        return PRIV_MGR_ERROR_SUCCESS;\r
 }\r
 \r
        return PRIV_MGR_ERROR_SUCCESS;\r
 }\r

diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec
index ffbdc47..992e52a 100644 (file)
--- a/packaging/privacy-manager.spec
+++ b/packaging/privacy-manager.spec
@@ -33,6 +33,8 @@ privacy-manager server devel
 
 %package -n privacy-manager-client
 summary: privacy-manager client
 
 %package -n privacy-manager-client
 summary: privacy-manager client

+Version: 0.0.2
+Release: 3

 Group: Development/Libraries
 Requires: privacy-manager-server = %{version}-%{release}
 
 Group: Development/Libraries
 Requires: privacy-manager-server = %{version}-%{release}
 


@@ -41,6 +43,8 @@ privacy-manager client
 
 %package -n privacy-manager-client-devel
 Summary:    privacy-manager client devel
 
 %package -n privacy-manager-client-devel
 Summary:    privacy-manager client devel

+Version: 0.0.2
+Release: 3

 Group:      Development/Libraries
 BuildRequires:  pkgconfig(libxml-2.0)
 Requires:   privacy-manager-client = %{version}-%{release}
 Group:      Development/Libraries
 BuildRequires:  pkgconfig(libxml-2.0)
 Requires:   privacy-manager-client = %{version}-%{release}


@@ -76,16 +80,21 @@ The Privacy Manager API provides functions to get/set information about privacy
 
 %build
 #%{!?build_type:%define build_type "Release"}
 
 %build
 #%{!?build_type:%define build_type "Release"}

+

 echo cmake . -DPREFIX=%{_prefix} \
         -DEXEC_PREFIX=%{_exec_prefix} \
         -DLIBDIR=%{_libdir} \
         -DINCLUDEDIR=%{_includedir} \
 echo cmake . -DPREFIX=%{_prefix} \
         -DEXEC_PREFIX=%{_exec_prefix} \
         -DLIBDIR=%{_libdir} \
         -DINCLUDEDIR=%{_includedir} \

-        -DCMAKE_BUILD_TYPE=%{build_type}
+        -DCMAKE_BUILD_TYPE=%{build_type} \
+        -DVERSION=%{version} \
+        -DDPL_LOG="ON" 

 cmake . -DPREFIX=%{_prefix} \
         -DEXEC_PREFIX=%{_exec_prefix} \
         -DLIBDIR=%{_libdir} \
         -DINCLUDEDIR=%{_includedir} \
 cmake . -DPREFIX=%{_prefix} \
         -DEXEC_PREFIX=%{_exec_prefix} \
         -DLIBDIR=%{_libdir} \
         -DINCLUDEDIR=%{_includedir} \

-        -DCMAKE_BUILD_TYPE=%{build_type}
+        -DCMAKE_BUILD_TYPE=%{build_type} \
+        -DVERSION=%{version} \
+        -DDPL_LOG="ON" 

 make %{?jobs:-j%jobs}
 
 %install
 make %{?jobs:-j%jobs}
 
 %install

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 3d7e8bb..0b0d40d 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -6,10 +6,6 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 SET(EXEC_PREFIX "\${prefix}")
 SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")

-SET(VERSION 0.0)
-
-SET(VERSION_MAJOR 0)
-SET(VERSION "${VERSION_MAJOR}.0.1")

 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED dlog sqlite3 dbus-1 dbus-glib-1)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED dlog sqlite3 dbus-1 dbus-glib-1)


@@ -73,8 +69,8 @@ ADD_DEFINITIONS("-DLOG_TAG=\"PRIVACY-MANAGER-SERVER\"")
 ADD_EXECUTABLE(privacy-manager-server ${PRIVACY_MANAGER_SERVER_SOURCES})
 TARGET_LINK_LIBRARIES(privacy-manager-server ${pkgs_LDFLAGS} ${pkgs_LIBRARIES})
 SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES COMPILE_FLAGS "${PRIVACY_MANAGER_SERVER_CFLAGS}")
 ADD_EXECUTABLE(privacy-manager-server ${PRIVACY_MANAGER_SERVER_SOURCES})
 TARGET_LINK_LIBRARIES(privacy-manager-server ${pkgs_LDFLAGS} ${pkgs_LIBRARIES})
 SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES COMPILE_FLAGS "${PRIVACY_MANAGER_SERVER_CFLAGS}")

-#SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES SOVERSION ${VERSION_MAJOR})
-#SET_TARGET_PROPERTIES(privacy-manager-server PROPERTIES VERSION ${VERSION})
+#SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES SOVERSION ${API_VERSION})
+#SET_TARGET_PROPERTIES(privacy-manager-client PROPERTIES VERSION ${VERSION})

 ###################################################################################################
 
 CONFIGURE_FILE(../privacy-manager-server.pc.in privacy-manager-server.pc @ONLY)
 ###################################################################################################
 
 CONFIGURE_FILE(../privacy-manager-server.pc.in privacy-manager-server.pc @ONLY)