From: hj kim <backto.kim@samsung.com>
Date: Thu, 16 Nov 2017 06:04:22 +0000 (+0900)
Subject: Remove unused test code and Modifiy some debug msg
X-Git-Tag: submit/tizen/20171120.082013~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c82ea12f8e65bc92588a57d61536651a1f995e1;p=platform%2Fcore%2Fmultimedia%2Fdcm-service.git

Remove unused test code and Modifiy some debug msg

Change-Id: I247fbc8cd76f24d2ee73cf1c06e29702747ba39d
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ca234a..fd236cb 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,6 @@ CONFIGURE_FILE(dcm-service.pc.in dcm-service.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dcm-service.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 ADD_SUBDIRECTORY(svc)
-#ADD_SUBDIRECTORY(test)
 
 LINK_DIRECTORIES(${LIB_INSTALL_DIR})
 
diff --git a/src/dcm_svc_db.c b/src/dcm_svc_db.c
index 18957e9..cdc0c04 100755
--- a/src/dcm_svc_db.c
+++ b/src/dcm_svc_db.c
@@ -77,8 +77,6 @@ int dcm_svc_db_connect(uid_t uid)
 
 	dcm_warn("media db handle: %p", db_handle);
 
-	dcm_debug_fleave();
-
 	return MS_MEDIA_ERR_NONE;
 }
 
diff --git a/src/dcm_svc_internal.c b/src/dcm_svc_internal.c
index d28afe9..76f57bd 100755
--- a/src/dcm_svc_internal.c
+++ b/src/dcm_svc_internal.c
@@ -120,7 +120,8 @@ int dcm_scan_single(const char *file_path, uid_t uid, int *face_count)
 
 	ret = __dcm_scan_process(scan_item);
 	if (ret != MS_MEDIA_ERR_NONE) {
-		dcm_error("Failed to process scan job! err: %d", ret);
+		if (ret != MS_MEDIA_ERROR_ALREADY_SCANNED)
+			dcm_error("Failed to process scan job! err: %d", ret);
 
 		/* If the scan item is not scanned, insert media uuid into face_scan_list */
 		if (ret != MS_MEDIA_ERROR_ALREADY_SCANNED)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
deleted file mode 100755
index 55b2c17..0000000
--- a/test/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-SET(fw_test "dcm-test")
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_test} REQUIRED glib-2.0 libmedia-utils libtzplatform-config)
-
-FOREACH(flag ${${fw_test}_CFLAGS})
-    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall")
-
-aux_source_directory(. sources)
-FOREACH(src ${sources})
-    GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
-    MESSAGE("${src_name}")
-    ADD_EXECUTABLE(${fw_test} ${src})
-    TARGET_LINK_LIBRARIES(${fw_test} ${fw_name} ${${fw_test}_LDFLAGS})
-ENDFOREACH()
-
-#INSTALL(TARGETS ${fw_test} DESTINATION bin)
diff --git a/test/dcm-test.c b/test/dcm-test.c
deleted file mode 100755
index 8bace4d..0000000
--- a/test/dcm-test.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  com.samsung.dcm-svc-client
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jiyong Min <jiyong.min@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <glib.h>
-#include <media-util.h>
-#include <tzplatform_config.h>
-
-#define MAX_STRING_LEN 4096
-#define ALL "ALL"
-#define SINGLE "SINGLE"
-
-static char *g_path = NULL;
-static char *g_command = NULL;
-
-int main(int argc, char **argv)
-{
-	if (argc < 1) {
-		printf("Usage: dcm_test ALL|SINGLE file_path \n");
-		return 0;
-	}
-
-	g_command = (char *)g_malloc(MAX_STRING_LEN * sizeof(char));
-	memset(g_command, 0x00, MAX_STRING_LEN);
-	snprintf(g_command, MAX_STRING_LEN, "%s", argv[1]);
-
-	if (strcmp(g_command, SINGLE) == 0) {
-		if (argc < 2) {
-			printf("Usage: dcm_test ALL|SINGLE file_path \n");
-			return 0;
-		}
-
-		g_path = (char *)g_malloc(MAX_STRING_LEN * sizeof(char));
-		memset(g_path, 0x00, MAX_STRING_LEN);
-		snprintf(g_path, MAX_STRING_LEN, "%s", argv[2]);
-
-		printf("dcm_test SINGLE file_path=%s \n", g_path);
-
-		dcm_svc_request_extract_media(g_path, tzplatform_getuid(TZ_USER_NAME));
-	} else if (strcmp(g_command, ALL) == 0) {
-		printf("dcm_test ALL \n");
-
-		dcm_svc_request_extract_all(tzplatform_getuid(TZ_USER_NAME));
-	} else {
-		printf("Usage: dcm_test ALL|SINGLE file_path \n");
-		return 0;
-	}
-
-	return -1;
-}