Revert "Apply xml interface"

This reverts commit efcdb549e1115c715ee8634f8e90a6595090a653

Change-Id: Ib4776f78e871428a6e482cb10a21e578e19570cc

diff --git a/src/system/FSys_SystemInfoImpl.cpp b/src/system/FSys_SystemInfoImpl.cpp
index dc94f8a..2b586c2 100644 (file)
--- a/src/system/FSys_SystemInfoImpl.cpp
+++ b/src/system/FSys_SystemInfoImpl.cpp
@@ -27,10 +27,8 @@
 #include <FBaseBoolean.h>
 #include <FBaseInteger.h>
 #include <FBaseColHashMap.h>
-#include <FBaseUtilStringUtil.h>
 
 #include <FBase_NativeError.h>
-#include <FBase_StringConverter.h>
 #include <FIo_RegistryImpl.h>
 #include <FSys_SystemInfoImpl.h>
 #include <FIo_AppServiceIpcMessages.h>
@@ -45,7 +43,6 @@ using namespace std;
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Io;
-using namespace Tizen::Base::Utility;
 
 namespace Tizen { namespace System
 {
@@ -266,8 +263,6 @@ _SystemInfoImpl::GetSysInfo(const String& key, String& value)
        result r = E_OBJ_NOT_FOUND;
        String tizenKey = ConvertToTizen(key);
 
-       SysLog(NID_SYS, "Request Key is %ls.", key.GetPointer());
-
        if (firstRequest == false)
        {
                PrepareCache();
@@ -443,42 +438,37 @@ _SystemInfoImpl::GetSysInfo(const String& key, String& value)
        }
        else if (tizenKey == _DUID)
        {
-               r = GetFromRegistry(tizenKey, value);
+               int ret = 0;
+               TapiHandle* handle = null;
+               int time_count = 0;
+               int status = 0;
 
-               if(r != E_SUCCESS)
+               handle = tel_init(null);
+               if(handle != null)
                {
-                       int ret = 0;
-                       TapiHandle* handle = null;
-                       int time_count = 0;
-                       int status = 0;
-
-                       handle = tel_init(null);
-                       if(handle != null)
+                       while(time_count < 30) //Wait 30 second.
                        {
-                               while(time_count < 30) //Wait 30 second.
+                               ret = tel_check_modem_power_status(handle, &status);
+                               SysLog(NID_SYS, "Modem check result is %d, status is %d.", handle, status);
+                               if(ret != TAPI_API_SUCCESS)
                                {
-                                       ret = tel_check_modem_power_status(handle, &status);
-                                       SysLog(NID_SYS, "Modem check result is %d, status is %d.", handle, status);
-                                       if(ret != TAPI_API_SUCCESS)
-                                       {
-                                               SysLogException(NID_SYS, E_SYSTEM, "It is failed to get Modem status.");
-                                               tel_deinit(handle);
-                                               return E_SYSTEM;
-                                       }
-
-                                       if(status == 0)
-                                       {
-                                               break;
-                                       }
-
-                                       usleep(1000000);
-                                       time_count++;
+                                       SysLogException(NID_SYS, E_SYSTEM, "It is failed to get Modem status.");
+                                       tel_deinit(handle);
+                                       return E_SYSTEM;
                                }
-                               tel_deinit(handle);
+
+                               if(status == 0)
+                               {
+                                       break;
+                               }
+
+                               usleep(1000000);
+                               time_count++;
                        }
-                       _SystemClient* pSystemClient = _SystemClient::GetInstance();
-                       r = pSystemClient->GetValue(tizenKey, value);
+                       tel_deinit(handle);
                }
+               _SystemClient* pSystemClient = _SystemClient::GetInstance();
+               r = pSystemClient->GetValue(tizenKey, value);
        }
        else
        {
@@ -486,21 +476,8 @@ _SystemInfoImpl::GetSysInfo(const String& key, String& value)
 
                if(r != E_SUCCESS)
                {
-                       char* pStringValue = null;
-                       String tKey;
-                       tizenKey.SubString(7, tKey);
-
-                       ClearLastResult();
-                       unique_ptr< char[] > systemKey(_StringConverter::CopyToCharArrayN(tKey));
-                       r = GetLastResult();
-                       SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "[%s] StringUtil::StringToUtf8N It is failed", GetErrorMessage(r));
-                       int ret = system_info_get_platform_string(systemKey.get(), &pStringValue);
-
-                       SysTryReturnResult(NID_SYS, ret == 0, E_OBJ_NOT_FOUND, "It is failed to get system information %ls from configration file.", tizenKey.GetPointer());
-
-                       r = StringUtil::Utf8ToString(pStringValue, value);
-                       free(pStringValue);
-                       r = E_SUCCESS;
+                       _SystemClient* pSystemClient = _SystemClient::GetInstance();
+                       r = pSystemClient->GetValue(tizenKey, value);
                }
        }
        if( r == E_SUCCESS)
@@ -516,8 +493,6 @@ _SystemInfoImpl::GetSysInfo(const String& key, int& value)
        result r = E_SUCCESS;
        String tizenKey = ConvertToTizen(key);
 
-       SysLog(NID_SYS, "Request Key is %ls.", key.GetPointer());
-
        if (firstRequest == false)
        {
                PrepareCache();
@@ -551,19 +526,8 @@ _SystemInfoImpl::GetSysInfo(const String& key, int& value)
                r = GetFromRegistry(tizenKey, value);
                if(r != E_SUCCESS)
                {
-                       int ret = 0;
-                       String tKey;
-
-                       tizenKey.SubString(7, tKey);
-
-                       ClearLastResult();
-                       unique_ptr< char[] > systemKey(_StringConverter::CopyToCharArrayN(tKey));
-                       r = GetLastResult(); 
-                       SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "[%s] StringUtil::StringToUtf8N It is failed", GetErrorMessage(r));
-                       ret = system_info_get_platform_int(systemKey.get(), &value);
-
-                       SysTryReturnResult(NID_SYS, ret == 0, E_OBJ_NOT_FOUND, "It is failed to get system information %ls from configration file.", tizenKey.GetPointer());
-                       r = E_SUCCESS;
+                       _SystemClient* pSystemClient = _SystemClient::GetInstance();
+                       r = pSystemClient->GetValue(tizenKey, value);
                }
        }
 
@@ -593,8 +557,6 @@ _SystemInfoImpl::GetSysInfo(const String& key, bool& value)
        result r = E_SUCCESS;
        String tizenKey = ConvertToTizen(key);
 
-       SysLog(NID_SYS, "Request Key is %ls.", key.GetPointer());
-
        if (firstRequest == false)
        {
                PrepareCache();
@@ -608,23 +570,32 @@ _SystemInfoImpl::GetSysInfo(const String& key, bool& value)
                return E_SUCCESS;
        }
 
-       r = GetFromRegistry(tizenKey, value);
-       if(r != E_SUCCESS)
+       if(key == L"http://tizen.org/feature/input.keys.menu")
        {
-               String tKey;
-               tizenKey.SubString(7, tKey);
-
-               ClearLastResult();
-               unique_ptr< char[] > systemKey(_StringConverter::CopyToCharArrayN(tKey));
-               r = GetLastResult();
-               SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "[%s] StringUtil::StringToUtf8N It is failed", GetErrorMessage(r));
-
                bool supported = false;
-               int ret = system_info_get_platform_bool(systemKey.get(), &supported);
-               SysTryReturnResult(NID_SYS, ret == 0, E_OBJ_NOT_FOUND, "It is failed to get system information %ls from configration file.", tizenKey.GetPointer());
+               int ret = system_info_get_platform_bool("tizen.org/feature/input.keys.menu", &supported);
+               SysTryReturnResult(NID_SYS, ret == 0, E_SYSTEM, "It is failed to get system information from configration file.");
                value = supported;
                r = E_SUCCESS;
        }
+       else if(key == L"http://tizen.org/feature/input.keys.back")
+       {
+               bool supported = false;
+               int ret = system_info_get_platform_bool("tizen.org/feature/input.keys.back", &supported);
+               SysTryReturnResult(NID_SYS, ret == 0, E_SYSTEM, "It is failed to get system information from configration file.");
+               value = supported;
+               r = E_SUCCESS;
+       }
+       else
+       {
+               r = GetFromRegistry(tizenKey, value);
+               if(r != E_SUCCESS)
+               {
+                       _SystemClient* pSystemClient = _SystemClient::GetInstance();
+                       r = pSystemClient->GetValue(tizenKey, value);
+               }
+               SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_OBJ_NOT_FOUND, "It is failed to get the key[%ls]", tizenKey.GetPointer());
+       }
 
        if(r == E_SUCCESS)
        {
@@ -654,25 +625,7 @@ _SystemInfoImpl::GetPlatformVersion(String& platformVersion)
        String tizenKey(_PLATFORM_VERSION);
 
        r = GetFromRegistry(tizenKey, platformVersion);
-
-       if(r != E_SUCCESS)
-       {
-               char* pStringValue = null;
-               String tKey;
-               tizenKey.SubString(7, tKey);
-
-               ClearLastResult();
-               unique_ptr< char[] > systemKey(_StringConverter::CopyToCharArrayN(tKey));
-               r = GetLastResult();
-               SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "[%s] StringUtil::StringToUtf8N It is failed", GetErrorMessage(r));
-               int ret = system_info_get_platform_string(systemKey.get(), &pStringValue);
-
-               SysTryReturnResult(NID_SYS, ret == 0, E_OBJ_NOT_FOUND, "It is failed to get system information %ls from configration file.", tizenKey.GetPointer());
-
-               r = StringUtil::Utf8ToString(pStringValue, platformVersion);
-               free(pStringValue);
-               r = E_SUCCESS;
-       }
+       SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to get the key[%ls]", tizenKey.GetPointer());
        return r;
 }
 
@@ -683,25 +636,7 @@ _SystemInfoImpl::GetBuildInfo(String& buildInfo)
        String tizenKey(_BUILD_STRING);
 
        r = GetFromRegistry(tizenKey, buildInfo);
-
-       if(r != E_SUCCESS)
-       {
-               char* pStringValue = null;
-               String tKey;
-               tizenKey.SubString(7, tKey);
-
-               ClearLastResult();
-               unique_ptr< char[] > systemKey(_StringConverter::CopyToCharArrayN(tKey));
-               r = GetLastResult();
-               SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "[%s] StringUtil::StringToUtf8N It is failed", GetErrorMessage(r));
-               int ret = system_info_get_platform_string(systemKey.get(), &pStringValue);
-
-               SysTryReturnResult(NID_SYS, ret == 0, E_OBJ_NOT_FOUND, "It is failed to get system information %ls from configration file.", tizenKey.GetPointer());
-
-               r = StringUtil::Utf8ToString(pStringValue, buildInfo);
-               free(pStringValue);
-               r = E_SUCCESS;
-       }
+       SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to get the key[%ls]", tizenKey.GetPointer());
        return r;
 }
 
@@ -712,25 +647,7 @@ _SystemInfoImpl::GetNativeApiVersion(String& nativeApiVersion)
        String tizenKey(_PLATFORM_NATIVE_API_VERSION);
 
        r = GetFromRegistry(tizenKey, nativeApiVersion);
-
-       if(r != E_SUCCESS)
-       {
-               char* pStringValue = null;
-               String tKey;
-               tizenKey.SubString(7, tKey);
-
-               ClearLastResult();
-               unique_ptr< char[] > systemKey(_StringConverter::CopyToCharArrayN(tKey));
-               r = GetLastResult();
-               SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "[%s] StringUtil::StringToUtf8N It is failed", GetErrorMessage(r));
-               int ret = system_info_get_platform_string(systemKey.get(), &pStringValue);
-
-               SysTryReturnResult(NID_SYS, ret == 0, E_OBJ_NOT_FOUND, "It is failed to get system information %ls from configration file.", tizenKey.GetPointer());
-
-               r = StringUtil::Utf8ToString(pStringValue, nativeApiVersion);
-               free(pStringValue);
-               r = E_SUCCESS;
-       }
+       SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to get the key[%ls]", tizenKey.GetPointer());
        return r;
 }
 
@@ -741,25 +658,7 @@ _SystemInfoImpl::GetWebApiVersion(String& webApiVersion)
        String tizenKey(_PLATFORM_WEB_API_VERSION);
 
        r = GetFromRegistry(tizenKey, webApiVersion);
-
-       if(r != E_SUCCESS)
-       {
-               char* pStringValue = null;
-               String tKey;
-               tizenKey.SubString(7, tKey);
-
-               ClearLastResult();
-               unique_ptr< char[] > systemKey(_StringConverter::CopyToCharArrayN(tKey));
-               r = GetLastResult();
-               SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "[%s] StringUtil::StringToUtf8N It is failed", GetErrorMessage(r));
-               int ret = system_info_get_platform_string(systemKey.get(), &pStringValue);
-
-               SysTryReturnResult(NID_SYS, ret == 0, E_OBJ_NOT_FOUND, "It is failed to get system information %ls from configration file.", tizenKey.GetPointer());
-
-               r = StringUtil::Utf8ToString(pStringValue, webApiVersion);
-               free(pStringValue);
-               r = E_SUCCESS;
-       }
+       SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to get the key[%ls]", tizenKey.GetPointer());
        return r;
 }
 
@@ -863,7 +762,6 @@ _SystemInfoImpl::GetFromRegistry(const String& key, int& value)
        result r = E_SUCCESS;
        _RegistryImpl _reg;
        String valStr;
-
        r = _reg.Construct(_REGISTRY_PATH, REG_OPEN_READ_ONLY, null);
        SysTryReturnResult(NID_SYS, r == E_SUCCESS, r, " RegistryImpl construct is failed");
 
@@ -881,7 +779,6 @@ _SystemInfoImpl::GetFromRegistry(const String& key, bool& value)
        result r = E_SUCCESS;
        _RegistryImpl _reg;
        String valStr;
-
        r = _reg.Construct(_REGISTRY_PATH, REG_OPEN_READ_ONLY, null);
        SysTryReturnResult(NID_SYS, r == E_SUCCESS, r, " RegistryImpl construct is failed");