From c0349646ee9452aa29ef81076bfed8df73ac23f0 Mon Sep 17 00:00:00 2001
From: Mu-Woong Lee <muwoong.lee@samsung.com>
Date: Mon, 24 Apr 2017 20:07:11 +0900
Subject: [PATCH] Update the URI format to be aligned with other context URIs

Change-Id: I0458ab649109ff6e8fa3283e3a5b8c0d0159c7aa
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
---
 schema/sample.xml            | 2 +-
 src/server/QueryChecker.cpp  | 2 +-
 src/server/SchemaChecker.cpp | 2 +-
 src/server/SchemaLoader.cpp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/schema/sample.xml b/schema/sample.xml
index 6e67c38..d7e30ab 100644
--- a/schema/sample.xml
+++ b/schema/sample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ContextStore>
-	<Schema uri="http://tizen.org/contextstore/location/geoposition" retention="168" limit="0">
+	<Schema uri="http://tizen.org/context/record/location/geoposition" retention="168" limit="0">
 		<Privilege access="Read">http://tizen.org/privilege/location</Privilege>
 		<Privilege access="Write">http://tizen.org/privilege/internal/service</Privilege>
 		<Attribute name="timestamp" type="Integer"/>
diff --git a/src/server/QueryChecker.cpp b/src/server/QueryChecker.cpp
index 20a8bed..b5658e9 100644
--- a/src/server/QueryChecker.cpp
+++ b/src/server/QueryChecker.cpp
@@ -30,7 +30,7 @@ QueryChecker::~QueryChecker()
 
 bool QueryChecker::validateUri(const std::string& uri)
 {
-	static std::regex uriRegex(URI_REGEX("contextstore"), std::regex::optimize);
+	static std::regex uriRegex(URI_REGEX("context\/record"), std::regex::optimize);
 	if (!std::regex_match(uri, uriRegex)) {
 		_E("Invalid parameter");
 		return false;
diff --git a/src/server/SchemaChecker.cpp b/src/server/SchemaChecker.cpp
index 3a7a165..ecc19cc 100644
--- a/src/server/SchemaChecker.cpp
+++ b/src/server/SchemaChecker.cpp
@@ -22,7 +22,7 @@
 using namespace ctx;
 
 SchemaChecker::SchemaChecker() :
-	__uriRegex(URI_REGEX("contextstore"), std::regex::optimize),
+	__uriRegex(URI_REGEX("context\/record"), std::regex::optimize),
 	__privilegeRegex(URI_REGEX("privilege"), std::regex::optimize),
 	__columnNameRegex(COL_REGEX, std::regex::optimize)
 {
diff --git a/src/server/SchemaLoader.cpp b/src/server/SchemaLoader.cpp
index 0e513e4..69bcce7 100644
--- a/src/server/SchemaLoader.cpp
+++ b/src/server/SchemaLoader.cpp
@@ -29,7 +29,7 @@
 
 	<?xml version="1.0" encoding="UTF-8"?>
 	<ContextStore version="1">
-		<Schema uri="http://tizen.org/contextstore/name/subname" retention="24" limit="10">
+		<Schema uri="http://tizen.org/context/record/name[/subname]" retention="24" limit="10">
 			<Privilege access="Read">http://tizen.org/privilege/healthinfo</Privilege>
 			<Privilege access="Write">http://tizen.org/privilege/internal/service</Privilege>
 			<Attribute name="name1" type="Integer"/>
-- 
2.7.4