create aggregated sub_location view

diff --git a/gnuplot/location.gnuplot b/gnuplot/location.gnuplot
index b421a64..9eec94e 100644 (file)
--- a/gnuplot/location.gnuplot
+++ b/gnuplot/location.gnuplot
@@ -27,7 +27,9 @@ map_color(pn) = ( \
 pn == 2012230015 ? 0xff0000 : \
 pn == 2009210010 ? 0x00ff00 : \
 pn == 2008050077 ? 0x0000ff : \
+pn == 2012230026 ? 0x0000ff : \
 pn == 2012230028 ? 0xff00ff : \
+pn == 2012230018 ? 0xff00ff : \
 pn == 2012230011 ? 0x00ffff : \
 0xff00ff )
 

diff --git a/views.pl b/views.pl
index 8c7bb41..bffb582 100755 (executable)
--- a/views.pl
+++ b/views.pl
@@ -27,6 +27,7 @@ while(<$o>) {
 close($o);
 
 my $sql;
+my @sql_location;
 my $view2number;
 
 open(my $n, '<', 'subvision-numbers.txt');
@@ -65,6 +66,13 @@ where pn = $pn $time
 };
        }
 
+       push @sql_location, qq{
+select 
+       to_char(time, 'YYYY-MM-DD HH24:MI:SS') as time, x_axis_angle + $offset_x as x_axis_angle, y_axis_angle + $offset_y as y_axis_angle, sensor_temperature, power_source_voltage, zc.pn
+from zc
+where pn = $pn $time
+};
+
 }
 close($n);
 
@@ -103,3 +111,9 @@ print $html_fh qq{
 </body>
 };
 
+print $sql_fh qq{
+drop view sub_$filter ;
+create or replace view sub_$filter as
+}, join(' union ', @sql_location) . qq{
+       order by 1 asc
+};

diff --git a/www/cgi-bin/location.cgi b/www/cgi-bin/location.cgi
index 185ca49..da7bfec 100755 (executable)
--- a/www/cgi-bin/location.cgi
+++ b/www/cgi-bin/location.cgi
@@ -17,7 +17,8 @@ echo $QUERY_STRING | grep -q voltage && voltage=1
 
 #set > /dev/shm/$pn.env
 
-cat $dir/location.sql | psql --username=dpavlin -A -F "," -t zc > /dev/shm/location.txt
+#cat $dir/location.sql | psql --username=dpavlin -A -F "," -t zc > /dev/shm/location.txt
+echo "select * from sub_bakaceva" | psql --username=dpavlin -A -F "," -t zc > /dev/shm/location.txt
 if [ -s /dev/shm/location.txt ] ; then
 cat $dir/location.gnuplot | sed -e "s|^set terminal.*$|set terminal svg size 1200,800|" -e "s,^set output.*$,set output," > /dev/shm/location.gnuplot