8.6.4

doxikus · Aug 12, 2015 · 83d6f6a · 83d6f6a
1 parent 1177319
commit 83d6f6a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/modules/highcharts/highcharts2 b/modules/highcharts/highcharts2
@@ -13,6 +13,8 @@ fi
 mkdir -p $dir/tmp/highcharts
 rm -rf $dir/tmp/highcharts/*
 
+cp $dir/dbf/nettemp.db $dir/tmp/highcharts
+
 # hosts
 name="$(sqlite3 $dir/dbf/hosts.db "SELECT name FROM hosts")"
 for i in $name; do
@@ -30,9 +32,9 @@ done
 # sensors
 
 for n in temp press lux humid; do
-    name=$(sqlite3 $dir/dbf/nettemp.db "SELECT name FROM sensors WHERE type='$n'")
+    name=$(sqlite3 $dir/tmp/highcharts/nettemp.db "SELECT name FROM sensors WHERE type='$n'")
     for i in $name; do
-	rom=$(sqlite3 $dir/dbf/nettemp.db "SELECT rom FROM sensors WHERE name='$i'")
+	rom=$(sqlite3 $dir/tmp/highcharts/nettemp.db "SELECT rom FROM sensors WHERE name='$i'")
 	    if base=$(sqlite3 $dir/db/$rom.sql "select strftime('%s', time),value FROM def ORDER BY time ASC;") ;
 		then
 		    #middle=$(printf "$base %s\n" | awk -F "|" '{printf "["}{ printf "%3.0f",($1+3600)*1000}{printf ","}{printf "%3.3f", $2}{print "]," }')
@@ -57,3 +59,6 @@ for i in $name; do
     	    echo "cannot read base"
     fi
 done
+
+
+rm $dir/tmp/highcharts/nettemp.db
diff --git a/readme.md b/readme.md
@@ -49,6 +49,10 @@ USERS:
 
 Changelog:
 
+8.6.4
+
+highcarts - improve charts generating and prevent lock base.
+
 8.6.3
 
 fix higcharts bug
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,10 @@ USERS: @@
     Changelog:
+.6.4
+    highcarts - improve charts generating and prevent lock base.
 .6.3
     fix higcharts bug
@@ Expand Down @@