From: kj7.sung <kj7.sung@samsung.com>
Date: Wed, 22 Nov 2017 02:34:20 +0000 (+0900)
Subject: Change nmea logging path
X-Git-Tag: submit/tizen/20171124.081621^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0d4e11f7bc26d41af89f4ec055a647655cda04d;p=platform%2Fcore%2Flocation%2Flbs-server.git

Change nmea logging path

Change-Id: I1fccca9a3bc562a0566afba9ea2364af83b60d32
Signed-off-by: kj7.sung <kj7.sung@samsung.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8323827..665910b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(BIN_DIR "${PREFIX}/bin")
 
 #Dependencies
 SET(common_dp "glib-2.0 lbs-dbus dlog gio-2.0 lbs-location")
-SET(server_dp "${common_dp} network tapi vconf vconf-internal-keys gthread-2.0  gio-unix-2.0 capi-network-wifi capi-system-info")
+SET(server_dp "${common_dp} network tapi vconf vconf-internal-keys gthread-2.0  gio-unix-2.0 capi-network-wifi capi-system-info libtzplatform-config")
 SET(module_dp "${common_dp} gmodule-2.0")
 
 # Set required packages
diff --git a/lbs-server/src/nmea_logger.c b/lbs-server/src/nmea_logger.c
index 4b53c86..662ee80 100644
--- a/lbs-server/src/nmea_logger.c
+++ b/lbs-server/src/nmea_logger.c
@@ -24,50 +24,22 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
+#include <tzplatform_config.h>
 #include "nmea_logger.h"
 #include "debug_util.h"
 
 #define MAX_NMEA_RAW_DATA_LOG_FILE_CNT	(999)
 #define MAX_NMEA_LOG_FILE_PATH		(100)
 
-#define PHONE_FOLDER			"/opt/usr/media"
-#define GPS_FOLDER		PHONE_FOLDER"/lbs-server"
-#define NMEA_FOLDER			GPS_FOLDER"/NMEA"
-#define NMEA_LOGGING_FILE_PATH		NMEA_FOLDER"/nmea_data"
+#define NMEA_LOGGING_FILE_PATH		tzplatform_mkpath(TZ_SYS_SHARE, "location/nmea")
 
 int raw_nmea_fd = -1;
 
 static int generate_nmea_log_file(char *);
-
 void start_nmea_log()
 {
 	char filepath[MAX_NMEA_LOG_FILE_PATH];
 
-	/* File Open */
-	struct stat st = {0};
-
-	if (stat(GPS_FOLDER, &st) == -1) {
-		if (mkdir(GPS_FOLDER, 0777) == -1) {
-			LOG_GPS(DBG_ERR, "Fail to make lbs-server folder");
-			raw_nmea_fd = -1;
-			return;
-		} else {
-			if (mkdir(NMEA_FOLDER, 0777) == -1) {
-				LOG_GPS(DBG_ERR, "Fail to make NMEA folder");
-				raw_nmea_fd = -1;
-				return;
-			}
-		}
-	} else {
-		if (stat(NMEA_FOLDER, &st) == -1) {
-			if (mkdir(NMEA_FOLDER, 0777) == -1) {
-				LOG_GPS(DBG_ERR, "Fail to make NMEA folder");
-				raw_nmea_fd = -1;
-				return;
-			}
-		}
-	}
-
 	if (generate_nmea_log_file(filepath) == -1) {
 		LOG_GPS(DBG_ERR, "Starting LBS Logging for RAW NMEA data FAILED!");
 		raw_nmea_fd = -1;
@@ -122,7 +94,7 @@ static int generate_nmea_log_file(char *filepath)
 	char fn[MAX_NMEA_LOG_FILE_PATH] = {0,};
 
 	for (idx = 0; idx < MAX_NMEA_RAW_DATA_LOG_FILE_CNT; idx++) {
-		g_snprintf(fn, MAX_NMEA_LOG_FILE_PATH, "%s%03d.txt", NMEA_LOGGING_FILE_PATH, idx);
+		g_snprintf(fn, MAX_NMEA_LOG_FILE_PATH, "%s/nmea_data%03d.txt", NMEA_LOGGING_FILE_PATH, idx);
 		if ((fd = access(fn, R_OK)) == -1) {
 			LOG_GPS(DBG_LOW, "Next log file [%s]", fn);
 			g_strlcpy(filepath, fn, strlen(fn) + 1);
diff --git a/packaging/lbs-server.spec b/packaging/lbs-server.spec
index 4503cff..1c031e6 100644
--- a/packaging/lbs-server.spec
+++ b/packaging/lbs-server.spec
@@ -1,6 +1,6 @@
 Name:    lbs-server
 Summary: LBS Server for Tizen
-Version: 1.3.1
+Version: 1.3.2
 Release: 1
 Group:   Location/Service
 License: Apache-2.0
@@ -23,6 +23,7 @@ BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(vconf-internal-keys)
 BuildRequires: pkgconfig(gthread-2.0)
 BuildRequires: pkgconfig(gmodule-2.0)
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 LBS Server for Tizen
@@ -74,6 +75,9 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
+mkdir -p %{buildroot}%{TZ_SYS_SHARE}/location
+mkdir -p %{buildroot}%{TZ_SYS_SHARE}/location/nmea
+
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/lbs-server.service
 %install_service multi-user.target.wants lbs-server.service
@@ -113,6 +117,9 @@ rm -rf %{buildroot}
 %{_unitdir}/multi-user.target.wants/lbs-server.service
 /opt/etc/dump.d/module.d/dump_gps.sh
 
+%defattr(-,location,location,-)
+%{TZ_SYS_SHARE}/location/nmea
+
 %files -n location-lbs-server
 %manifest location-lbs-server.manifest
 %license LICENSE