From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Fri, 1 Jul 2016 06:45:58 +0000 (+0900)
Subject: sensor: align recording request json format with sensor api
X-Git-Tag: submit/tizen/20160705.023110~1^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c68cdb7f0ee1932814da2d51b8e51f2e0c5e3205;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git

sensor: align recording request json format with sensor api

Change-Id: Ief0236c20797bdd14fa327cbd3a085c93ff1a0bc
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
---

diff --git a/src/sensor/SensorProvider.cpp b/src/sensor/SensorProvider.cpp
index 8cc8e1f..71e4c01 100644
--- a/src/sensor/SensorProvider.cpp
+++ b/src/sensor/SensorProvider.cpp
@@ -98,6 +98,7 @@ int SensorProvider::write(Json data, Json *requestResult)
 
 	std::string operation;
 	std::string pkgId;
+	Json option;
 	int retentionPeriod = DEFAULT_RETENTION;
 
 	_J("Data", data);
@@ -105,13 +106,15 @@ int SensorProvider::write(Json data, Json *requestResult)
 	IF_FAIL_RETURN(data.get(NULL, KEY_OPERATION, &operation), ERR_INVALID_PARAMETER);
 	IF_FAIL_RETURN(data.get(NULL, KEY_CLIENT_PKG_ID, &pkgId), ERR_INVALID_PARAMETER);
 
-	if (data.get(NULL, KEY_RETENTION, &retentionPeriod))
-		retentionPeriod *= SECONDS_PER_HOUR;
+	data.get(NULL, KEY_OPTION, &option);
 
-	/* TODO: remove the operation & pkg id from the json */
+	if (option.get(NULL, KEY_RETENTION, &retentionPeriod)) {
+		retentionPeriod *= SECONDS_PER_HOUR;
+		option.remove(NULL, KEY_RETENTION);
+	}
 
 	if (operation == VAL_START)
-		return __addClient(pkgId, retentionPeriod, data);
+		return __addClient(pkgId, retentionPeriod, option);
 	else if (operation == VAL_STOP)
 		return __removeClient(pkgId);