diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index ca9e15ab..eade09cc 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -554,10 +554,16 @@ CHECKTEMP(){ [ "${mysql_conn}" != "" ] && OLD_temp_f=($(${mysql_conn} -e "SELECT temp,date FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND entity=${entityid[1]} AND date >= DATE_SUB(NOW(), INTERVAL $(expr ${M} + 1) MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 6) MINUTE) ORDER BY date ASC LIMIT 1")) # echo "${OLD_temp_f[0]} - ${OLD_temp_f[1]} - ${OLD_temp_f[2]} - ${OLD_temp_f[3]}" fi - OLD_date=${OLD_temp_f[1]} - OLD_time=${OLD_temp_f[2]} - OLD_temp_f=${OLD_temp_f[0]} - # echo "HERE: $OLD_temp_f - $OLD_date - $OLD_time" + if [[ "${IP}" == "10.6.1"* ]]; then + OLD_date=${OLD_temp_f[1]} + OLD_time=${OLD_temp_f[2]} + OLD_temp_f=${OLD_temp_f[0]} + else + OLD_date=${OLD_temp_f[3]} + OLD_time=${OLD_temp_f[4]} + OLD_temp_f=${OLD_temp_f[2]} + fi + fi if [ "${OLD_temp_f}" != "" ]; then if [ $(bc -l <<< "${temp_f} < $(echo "scale=2; ${OLD_temp_f}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD_temp_f}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then