Changed battery usage normalization logic & Version 0.9.10

Change-Id: Ic27d93caf1322276d93da199cf19d5fc9cc9aae3
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

diff --git a/packaging/context-provider.spec b/packaging/context-provider.spec
index acccdbb..cc39fd3 100644 (file)
--- a/packaging/context-provider.spec
+++ b/packaging/context-provider.spec
@@ -1,6 +1,6 @@
 Name:       context-provider
 Summary:    Context Provider
-Version:    0.9.9
+Version:    0.9.10
 Release:    1
 Group:      Service/Context
 License:    Apache-2.0

diff --git a/src/battery-stats/Querier.cpp b/src/battery-stats/Querier.cpp
index 1185165..15c8f95 100644 (file)
--- a/src/battery-stats/Querier.cpp
+++ b/src/battery-stats/Querier.cpp
@@ -20,12 +20,16 @@
 #include "Querier.h"
 
 #define BATTERY_USAGE_QUERY \
-       "SELECT " BATTERY_APP_ID " AS " KEY_APP_ID ", ROUND(SUM(" BATTERY_AMOUNT ")/10000.0, 2) AS " KEY_TOTAL_AMOUNT \
+       "SELECT " BATTERY_APP_ID " AS " KEY_APP_ID ", ROUND(100.0 * SUM(" BATTERY_AMOUNT ") / " \
+       "(SELECT SUM(" BATTERY_AMOUNT ") FROM " BATTERY_USAGE_TABLE " WHERE " BATTERY_START_TIME " >= %d AND " BATTERY_END_TIME " <= %d)" \
+       ", 2) AS " KEY_TOTAL_AMOUNT \
        " FROM " BATTERY_USAGE_TABLE " WHERE " BATTERY_START_TIME " >= %d AND " BATTERY_END_TIME " <= %d" \
        " GROUP BY " KEY_APP_ID " ORDER BY " KEY_TOTAL_AMOUNT " DESC"
 
 #define RECENT_BATTERY_USAGE_QUERY \
-       "SELECT " BATTERY_APP_ID " AS " KEY_APP_ID ", ROUND(SUM(" BATTERY_AMOUNT ")/10000.0, 2) AS " KEY_TOTAL_AMOUNT \
+       "SELECT " BATTERY_APP_ID " AS " KEY_APP_ID ", ROUND(100.0 * SUM(" BATTERY_AMOUNT ") / " \
+       "(SELECT SUM(" BATTERY_AMOUNT ") FROM " BATTERY_USAGE_TABLE " WHERE " BATTERY_START_TIME " >= %d AND " BATTERY_END_TIME " <= %d)" \
+       ", 2) AS " KEY_TOTAL_AMOUNT \
        ", %d AS " KEY_USED_TIME \
        " FROM " BATTERY_USAGE_TABLE " WHERE " BATTERY_START_TIME " >= %d AND " BATTERY_END_TIME " <= %d" \
        " GROUP BY " KEY_APP_ID " ORDER BY " KEY_TOTAL_AMOUNT " DESC"
@@ -49,7 +53,7 @@ int BatteryStatsQuerier::query(const char *sql)
 
 int BatteryStatsQuerier::query(int startTime, int endTime)
 {
-       char *sql = sqlite3_mprintf(BATTERY_USAGE_QUERY, startTime, endTime);
+       char *sql = sqlite3_mprintf(BATTERY_USAGE_QUERY, startTime, endTime, startTime, endTime);
 
        int error = query(sql);
        sqlite3_free(sql);
@@ -59,7 +63,7 @@ int BatteryStatsQuerier::query(int startTime, int endTime)
 
 int BatteryStatsQuerier::query(int startTime, int endTime, int resultSize)
 {
-       char *sql = sqlite3_mprintf(BATTERY_USAGE_QUERY " LIMIT %d", startTime, endTime, resultSize);
+       char *sql = sqlite3_mprintf(BATTERY_USAGE_QUERY " LIMIT %d", startTime, endTime, startTime, endTime, resultSize);
 
        int error = query(sql);
        sqlite3_free(sql);
@@ -69,7 +73,7 @@ int BatteryStatsQuerier::query(int startTime, int endTime, int resultSize)
 
 int BatteryStatsQuerier::queryRecent(int startTime, int endTime)
 {
-       char *sql = sqlite3_mprintf(RECENT_BATTERY_USAGE_QUERY, endTime - startTime, startTime, endTime);
+       char *sql = sqlite3_mprintf(RECENT_BATTERY_USAGE_QUERY, startTime, endTime,  endTime - startTime, startTime, endTime);
 
        int error = query(sql);
        sqlite3_free(sql);
@@ -79,7 +83,7 @@ int BatteryStatsQuerier::queryRecent(int startTime, int endTime)
 
 int BatteryStatsQuerier::queryRecent(int startTime, int endTime, int resultSize)
 {
-       char *sql = sqlite3_mprintf(RECENT_BATTERY_USAGE_QUERY " LIMIT %d", endTime - startTime, startTime, endTime, resultSize);
+       char *sql = sqlite3_mprintf(RECENT_BATTERY_USAGE_QUERY " LIMIT %d", startTime, endTime, endTime - startTime, startTime, endTime, resultSize);
 
        int error = query(sql);
        sqlite3_free(sql);