From e552cce8b0f9a01bec42677f33e6a5c334e51a03 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 13 Jan 2024 10:52:32 -0600
Subject: [PATCH] update

---
 defaults.inc     |  2 +-
 inc/power.inc.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index d67738eb..de3ee62a 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 
-VERS='2.5.139-01132024'
+VERS='2.5.140-01132024'
 
 noheader=' update service dailytemp confsync -r -report '
 
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index f271ec52..a6f7de68 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -7,7 +7,6 @@ AVERAGEPOWER(){
 		total_amp=0
 		total_watt=0
 		while IFS=$'\t' read date amp watt ;do
-			# echo "HERE: '${amp}'"
 			if [ "${amp}" != "" ] && [ "${amp}" != "NULL" ]; then
 				total_amp=$(bc <<< "scale=2; ${total_amp}+${amp}")
 				((logsfound_amp++))
@@ -16,7 +15,6 @@ AVERAGEPOWER(){
 				total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}")
 				((logsfound_watt++))
 			fi
-		# done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,amp,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() AND amp IS NOT NULL AND watt IS NOT NULL ORDER BY id DESC;")
 		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,amp,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;")
 		if [ "${logsfound_watt}" != "0" ]; then
 			average_amp=$(bc <<< "scale=2; ${total_amp}/${logsfound_amp}")
@@ -31,9 +29,11 @@ AVERAGEPOWER(){
 		total=0
 		[ "${3}" != "" ] && ptype=${3} || ptype=watt
 		while IFS=$'\t' read date ${ptype} ;do
-			total=$(bc <<< "scale=2; ${total}+${!ptype}")
-			((logsfound++))
-		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,${ptype} from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() AND ${ptype} IS NOT NULL ORDER BY id DESC;")
+			if [ "${!ptype}" != "" ] && [ "${!ptype}" != "NULL" ]; then
+				total=$(bc <<< "scale=2; ${total}+${!ptype}")
+				((logsfound++))
+			fi
+		done  < <(${mysql_conn} -se "USE servermonitor; SELECT date,${ptype} from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;")
 		[ "${logsfound}" != "0" ] && average=$(bc <<< "scale=2; ${total}/${logsfound}") || average=0
 		echo ${average}
 	fi