Ignoring values of TOTAL_* details when fetching interface data.

Description: When fetching interface related data and chunk data
TOTAL_IPV4, TOTAL_IPV6, TOTAL_WIFI, TOTAL_BLUETOOTH, TOTAL_DATACALL
app_id were increasing redundant data in fetch query.

Change-Id: Icc074219dfd9e83832d7f193040969fd23a30d43
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>

diff --git a/packaging/stc-manager.spec b/packaging/stc-manager.spec
index fafa1dd..a15bc75 100644 (file)
--- a/packaging/stc-manager.spec
+++ b/packaging/stc-manager.spec
@@ -1,6 +1,6 @@
 Name:       stc-manager
 Summary:    STC(Smart Traffic Control) manager
-Version:    0.0.27
+Version:    0.0.28
 Release:    0
 Group:      Network & Connectivity/Other
 License:    Apache-2.0

diff --git a/src/database/tables/table-statistics.c b/src/database/tables/table-statistics.c
index 9564d8e..1b6d288 100755 (executable)
--- a/src/database/tables/table-statistics.c
+++ b/src/database/tables/table-statistics.c
@@ -103,9 +103,8 @@
 #define SELECT_TOTAL "select iftype, hw_net_protocol_type, " \
        "is_roaming, sum(received) as received, sum(sent) as sent, " \
        "ifname, imsi, ground from statistics " \
-       " where (time_stamp between ? and ?) and binpath != 'TOTAL_DATACALL' " \
-       "and binpath != 'TOTAL_WIFI' and binpath != 'TOTAL_BLUETOOTH' " \
-       "and binpath != 'TOTAL_IPV4' and binpath != 'TOTAL_IPV6' " \
+       "where (time_stamp between ? and ?) " \
+       "and binpath NOT LIKE 'TOTAL_%' " \
        "group by iftype, ifname, imsi, hw_net_protocol_type, is_roaming " \
        "order by time_stamp, iftype, ifname, imsi, hw_net_protocol_type, " \
        "is_roaming"
@@ -113,8 +112,8 @@
 #define SELECT_TOTAL_IFACE "select iftype, hw_net_protocol_type, " \
        "is_roaming, sum(received) as received, sum(sent) as sent, " \
        "ifname, imsi, ground from statistics " \
-       " where (time_stamp between ? and ?) " \
-       "and iftype=? " \
+       "where (time_stamp between ? and ?) and iftype=? " \
+       "and binpath NOT LIKE 'TOTAL_%' " \
        "group by hw_net_protocol_type, is_roaming, " \
        "iftype, ifname, imsi " \
        "order by time_stamp, iftype, ifname, imsi, hw_net_protocol_type, " \
@@ -124,6 +123,7 @@
        "is_roaming, sum(received) as received, sum(sent) as sent, " \
        "ifname, imsi, ground, time_stamp - time_stamp % ? as time_stamp " \
        "from statistics where time_stamp between ? and ? " \
+       "and binpath NOT LIKE 'TOTAL_%' " \
        "group by time_stamp, iftype, ifname, imsi, hw_net_protocol_type, " \
        "is_roaming " \
        "order by time_stamp, iftype, ifname, imsi, hw_net_protocol_type, " \
@@ -134,6 +134,7 @@
        "ifname, imsi, ground, time_stamp - time_stamp % ? as time_stamp " \
        "from statistics where time_stamp between ? and ? " \
        "and iftype = ? " \
+       "and binpath NOT LIKE 'TOTAL_%' " \
        "group by time_stamp, hw_net_protocol_type, is_roaming, iftype, ifname, imsi " \
        "order by time_stamp, hw_net_protocol_type, is_roaming, iftype, " \
        "ifname, imsi"