File wview-mammut_tuning_for_suse-5.5.0.diff of Package wview

Overview Repositories Revisions Requests Users Attributes Meta

File wview-mammut_tuning_for_suse-5.5.0.diff of Package wview (Revision 4342c19f066a809dc109c12175d27aac)

Currently displaying revision 4342c19f066a809dc109c12175d27aac , Show latest

diff -urN wview-5.5.0/alarms/Makefile.am wview-5.5.0-patch/alarms/Makefile.am
--- wview-5.5.0/alarms/Makefile.am	2009-04-20 02:01:04.000000000 +0300
+++ wview-5.5.0-patch/alarms/Makefile.am	2009-06-03 11:44:03.000000000 +0300
@@ -10,8 +10,8 @@
 		-I$(top_srcdir)/common \
 		-I$(prefix)/include \
 		-D_GNU_SOURCE \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_WVALARMD
 
 # define the sources
@@ -29,8 +29,8 @@
 
 
 # define libraries
-wvalarmd_LDADD = -lc -lm -lrad -lsqlite3
+wvalarmd_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-wvalarmd_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wvalarmd_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/cwop/Makefile.am wview-5.5.0-patch/cwop/Makefile.am
--- wview-5.5.0/cwop/Makefile.am	2009-04-20 02:01:29.000000000 +0300
+++ wview-5.5.0-patch/cwop/Makefile.am	2009-06-03 11:43:38.000000000 +0300
@@ -1,34 +1,34 @@
-# Makefile - wvcwopd
-
-# files to include in the distro but not build
-
-#define the executable to be built
-bin_PROGRAMS = wvcwopd
-
-# define include directories
-INCLUDES = \
-		-I$(top_srcdir)/common \
-		-I$(prefix)/include \
-		-D_GNU_SOURCE \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
-		-DBUILD_WVCWOPD
-
-# define the sources
-wvcwopd_SOURCES = \
-		$(top_srcdir)/common/wvutils.c \
-		$(top_srcdir)/common/wvconfig.c \
-		$(top_srcdir)/cwop/cwop.c \
-		$(top_srcdir)/common/datadefs.h \
-		$(top_srcdir)/common/services.h \
-		$(top_srcdir)/common/sysdefs.h \
-		$(top_srcdir)/common/wvconfig.h \
-		$(top_srcdir)/cwop/cwop.h
-
-
-# define libraries
-wvcwopd_LDADD = -lc -lm -lrad -lsqlite3
-
-# define library directories
-wvcwopd_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
-
+# Makefile - wvcwopd
+
+# files to include in the distro but not build
+
+#define the executable to be built
+bin_PROGRAMS = wvcwopd
+
+# define include directories
+INCLUDES = \
+		-I$(top_srcdir)/common \
+		-I$(prefix)/include \
+		-D_GNU_SOURCE \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
+		-DBUILD_WVCWOPD
+
+# define the sources
+wvcwopd_SOURCES = \
+		$(top_srcdir)/common/wvutils.c \
+		$(top_srcdir)/common/wvconfig.c \
+		$(top_srcdir)/cwop/cwop.c \
+		$(top_srcdir)/common/datadefs.h \
+		$(top_srcdir)/common/services.h \
+		$(top_srcdir)/common/sysdefs.h \
+		$(top_srcdir)/common/wvconfig.h \
+		$(top_srcdir)/cwop/cwop.h
+
+
+# define libraries
+wvcwopd_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
+
+# define library directories
+wvcwopd_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
+
diff -urN wview-5.5.0/dbexport/Makefile.am wview-5.5.0-patch/dbexport/Makefile.am
--- wview-5.5.0/dbexport/Makefile.am	2009-04-04 22:32:07.000000000 +0300
+++ wview-5.5.0-patch/dbexport/Makefile.am	2009-06-03 11:42:51.000000000 +0300
@@ -14,8 +14,8 @@
 wview-mysql-export: $(srcdir)/wview-mysql-export.sh
 	rm -f wview-mysql-export
 	echo "#!/bin/sh" > wview-mysql-export
-	echo "WVIEW_CONF_DIR=$(prefix)/etc/wview" >> wview-mysql-export
-	echo "WVIEW_DATA_DIR=$(prefix)/var/wview" >> wview-mysql-export
+	echo "WVIEW_CONF_DIR=/etc/wview" >> wview-mysql-export
+	echo "WVIEW_DATA_DIR=/var/run/wview" >> wview-mysql-export
 	cat $(srcdir)/wview-mysql-export.sh >> wview-mysql-export
 	chmod ugo+x wview-mysql-export
 
@@ -28,8 +28,8 @@
 wview-pgsql-export: $(srcdir)/wview-pgsql-export.sh
 	rm -f wview-pgsql-export
 	echo "#!/bin/sh" > wview-pgsql-export
-	echo "WVIEW_CONF_DIR=$(prefix)/etc/wview" >> wview-pgsql-export
-	echo "WVIEW_DATA_DIR=$(prefix)/var/wview" >> wview-pgsql-export
+	echo "WVIEW_CONF_DIR=/etc/wview" >> wview-pgsql-export
+	echo "WVIEW_DATA_DIR=/var/run/wview" >> wview-pgsql-export
 	cat $(srcdir)/wview-pgsql-export.sh >> wview-pgsql-export
 	chmod ugo+x wview-pgsql-export
 
diff -urN wview-5.5.0/examples/conf/wview-conf.sql wview-5.5.0-patch/examples/conf/wview-conf.sql
--- wview-5.5.0/examples/conf/wview-conf.sql	2009-05-02 20:35:26.000000000 +0300
+++ wview-5.5.0-patch/examples/conf/wview-conf.sql	2009-06-03 11:46:19.000000000 +0300
@@ -34,8 +34,8 @@
 INSERT INTO "config" VALUES('HTMLGEN_STATION_NAME','changeme','Station Name:','ENABLE_HTMLGEN');
 INSERT INTO "config" VALUES('HTMLGEN_STATION_CITY','changeme','Station City:','ENABLE_HTMLGEN');
 INSERT INTO "config" VALUES('HTMLGEN_STATION_STATE','changeme','Station State:','ENABLE_HTMLGEN');
-INSERT INTO "config" VALUES('HTMLGEN_IMAGE_PATH','/usr/local/var/wview/img','Where to store generated html and graphics files:','ENABLE_HTMLGEN');
-INSERT INTO "config" VALUES('HTMLGEN_HTML_PATH','/usr/local/etc/wview/html','Where to find HTML template files:','ENABLE_HTMLGEN');
+INSERT INTO "config" VALUES('HTMLGEN_IMAGE_PATH','/var/run/wview/img','Where to store generated html and graphics files:','ENABLE_HTMLGEN');
+INSERT INTO "config" VALUES('HTMLGEN_HTML_PATH','/usr/share/wview/html','Where to find HTML template files:','ENABLE_HTMLGEN');
 INSERT INTO "config" VALUES('HTMLGEN_START_OFFSET','0','Generation start offset (0-4) in minutes:','ENABLE_HTMLGEN');
 INSERT INTO "config" VALUES('HTMLGEN_GENERATE_INTERVAL','1','How often to generate (refresh interval for your site data) in minutes:','ENABLE_HTMLGEN');
 INSERT INTO "config" VALUES('HTMLGEN_METRIC_UNITS','no','Enable metric conversion/units?','ENABLE_HTMLGEN');
@@ -54,7 +54,7 @@
 INSERT INTO "config" VALUES('ALARMS_1_MAX','no','Is this an upper bound alarm?','ENABLE_ALARMS');
 INSERT INTO "config" VALUES('ALARMS_1_THRESHOLD','0','Upper/lower bound value (threshold) (float or integer):','ENABLE_ALARMS');
 INSERT INTO "config" VALUES('ALARMS_1_ABATEMENT','600','Number of seconds to suppress alarms after an alarm triggers:','ENABLE_ALARMS');
-INSERT INTO "config" VALUES('ALARMS_1_EXECUTE','/usr/local/etc/wview/alarms/your-alarm.sh','Full path to the shell script or binary to execute when the alarm triggers:','ENABLE_ALARMS');
+INSERT INTO "config" VALUES('ALARMS_1_EXECUTE','/etc/wview/alarms/your-alarm.sh','Full path to the shell script or binary to execute when the alarm triggers:','ENABLE_ALARMS');
 INSERT INTO "config" VALUES('ALARMS_2_TYPE','0','(2 of 10) Alarm Type (see the User Manual file for valid types):','ENABLE_ALARMS');
 INSERT INTO "config" VALUES('ALARMS_2_MAX','no','Is this an upper bound alarm?','ENABLE_ALARMS');
 INSERT INTO "config" VALUES('ALARMS_2_THRESHOLD','0','Upper/lower bound value (threshold) (float or integer):','ENABLE_ALARMS');
@@ -106,43 +106,43 @@
 INSERT INTO "config" VALUES('FTP_REMOTE_DIRECTORY','','Optional Remote Transfer Directory (relative to the ftp login directory, no leading ''/''):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_BINARY','/usr/bin/tnftp','FTP Binary Full Path:','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_ARGS','-iV','FTP Binary options:','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_1_SOURCE','*.png','(1 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_1_SOURCE','*.png','(1 of 10) Source file (relative to /var/run/wview/img):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_RULE_1_INTERVAL','5','Transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_2_SOURCE','*.htm','(2 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_2_SOURCE','*.htm','(2 of 10) Source file (relative to /var/run/wview/img):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_RULE_2_INTERVAL','5','Transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_3_SOURCE','*.html','(3 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_3_SOURCE','*.html','(3 of 10) Source file (relative to /var/run/wview/img):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_RULE_3_INTERVAL','5','Transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_4_SOURCE','*.xml','(4 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_4_SOURCE','*.xml','(4 of 10) Source file (relative to /var/run/wview/img):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_RULE_4_INTERVAL','5','Transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_5_SOURCE','Archive/*.txt','(5 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_5_SOURCE','Archive/*.txt','(5 of 10) Source file (relative to /var/run/wview/img):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_RULE_5_INTERVAL','5','Transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_6_SOURCE','NOAA/*.txt','(6 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_6_SOURCE','NOAA/*.txt','(6 of 10) Source file (relative to /var/run/wview/img):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_RULE_6_INTERVAL','5','Transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_7_SOURCE','','(7 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_7_SOURCE','','(7 of 10) Source file (relative to /var/run/wview/img):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_RULE_7_INTERVAL','0','Transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_8_SOURCE','','(8 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_8_SOURCE','','(8 of 10) Source file (relative to /var/run/wview/img):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_RULE_8_INTERVAL','0','Transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_9_SOURCE','','(9 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_9_SOURCE','','(9 of 10) Source file (relative to /var/run/wview/img):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_RULE_9_INTERVAL','0','Transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_10_SOURCE','','(10 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_10_SOURCE','','(10 of 10) Source file (relative to /var/run/wview/img):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_RULE_10_INTERVAL','0','Transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('SSH_1_SOURCE','/usr/local/var/wview/img','(1 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_1_SOURCE','/var/wview/img','(1 of 5) Local Source directory (normally /var/run/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_INTERVAL','1','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_HOST','remotehost.net','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_DESTINATION','http/wview','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_2_SOURCE','','(2 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_2_SOURCE','','(2 of 5) Local Source directory (normally /var/run/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_3_SOURCE','','(3 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_3_SOURCE','','(3 of 5) Local Source directory (normally /var/run/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_4_SOURCE','','(4 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_4_SOURCE','','(4 of 5) Local Source directory (normally /var/run/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_5_SOURCE','','(5 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_5_SOURCE','','(5 of 5) Local Source directory (normally /var/run/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_5_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_5_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_5_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
diff -urN wview-5.5.0/examples/SuSE/Makefile.am wview-5.5.0-patch/examples/SuSE/Makefile.am
--- wview-5.5.0/examples/SuSE/Makefile.am	2009-03-08 09:23:08.000000000 +0200
+++ wview-5.5.0-patch/examples/SuSE/Makefile.am	2009-06-03 11:36:42.000000000 +0300
@@ -8,12 +8,5 @@
 CLEANFILES = $(noinst_SCRIPTS)
 
 wview: $(srcdir)/wview.sh
-	echo "#!/bin/sh" > wview
-	echo "" >> wview
-	echo "# add to the shared library search path" >> wview
-	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
-	echo "CONF_DIRECTORY=$(prefix)/etc/wview" >> wview
-	echo "RUN_DIRECTORY=$(prefix)/var/wview" >> wview
-	echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview
 	cat $(srcdir)/wview.sh >> wview
 	chmod ugo+x wview
diff -urN wview-5.5.0/examples/SuSE/wview.sh wview-5.5.0-patch/examples/SuSE/wview.sh
--- wview-5.5.0/examples/SuSE/wview.sh	2009-03-08 09:23:08.000000000 +0200
+++ wview-5.5.0-patch/examples/SuSE/wview.sh	2009-06-03 11:40:38.000000000 +0300
@@ -1,5 +1,4 @@
-#
-# /etc/init.d/wview
+#!/bin/sh
 #
 # Start/Stop the wview daemons
 #
@@ -7,6 +6,22 @@
 #
 # SuSE control script
 #
+#
+### BEGIN INIT INFO
+# Provides: wview
+# Required-Start: $syslog $remote_fs
+# Should-Start: $time ypbind smtp
+# Required-Stop: $syslog $remote_fs
+# Should-Stop: ypbind smtp
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 6
+# Short-Description: Weather view daemon
+# Description: Start/Stop the wview daemons
+### END INIT INFO
+
+CONF_DIRECTORY=/etc/wview
+RUN_DIRECTORY=/var/run/wview
+WVIEW_INSTALL_DIR=/usr/bin
 
 
 # load the configuration
diff -urN wview-5.5.0/ftp/Makefile.am wview-5.5.0-patch/ftp/Makefile.am
--- wview-5.5.0/ftp/Makefile.am	2009-04-20 02:01:44.000000000 +0300
+++ wview-5.5.0-patch/ftp/Makefile.am	2009-06-03 11:47:16.000000000 +0300
@@ -8,8 +8,8 @@
 # define include directories
 INCLUDES = 	-I$(top_srcdir)/common \
 		-I$(prefix)/include \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-D_GNU_SOURCE
 
 # define the sources
@@ -28,8 +28,8 @@
 
 
 # define libraries
-wviewftpd_LDADD = -lc -lm -lrad -lsqlite3
+wviewftpd_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-wviewftpd_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wviewftpd_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/ftp/wviewftp.debug.sh wview-5.5.0-patch/ftp/wviewftp.debug.sh
--- wview-5.5.0/ftp/wviewftp.debug.sh	2009-02-05 07:09:28.000000000 +0200
+++ wview-5.5.0-patch/ftp/wviewftp.debug.sh	2009-06-03 12:26:43.000000000 +0300
@@ -20,7 +20,7 @@
 # 3. modify the LOGFILE and wviewVAR variables below:
 #
 LOGFILE=/root/wview/wview_ftp_debug.txt
-wviewVAR=/usr/local/var/wview
+wviewVAR=/var/run/wview
 wviewFTP_BINARY=/usr/bin/tnftp
 #
 # 4. modify your wviewftp.conf file and have wview execute this script for 
diff -urN wview-5.5.0/htmlgenerator/Makefile.am wview-5.5.0-patch/htmlgenerator/Makefile.am
--- wview-5.5.0/htmlgenerator/Makefile.am	2009-04-20 02:02:04.000000000 +0300
+++ wview-5.5.0-patch/htmlgenerator/Makefile.am	2009-06-03 11:47:45.000000000 +0300
@@ -10,8 +10,8 @@
 		-I$(top_srcdir)/common \
 		-I$(prefix)/include \
 		-D_GNU_SOURCE \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_HTMLGEND
 
 # define the sources
@@ -61,8 +61,8 @@
 
 
 # define libraries
-htmlgend_LDADD = -lrad -lsqlite3 -lgd -lpng -lz -lc -lm
+htmlgend_LDADD = -lrad -lsqlite3 -lgd -lpng -lz -lc -lm -lmysqlclient
 
 # define library directories
-htmlgend_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+htmlgend_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/http/Makefile.am wview-5.5.0-patch/http/Makefile.am
--- wview-5.5.0/http/Makefile.am	2009-04-20 02:02:17.000000000 +0300
+++ wview-5.5.0-patch/http/Makefile.am	2009-06-03 11:41:38.000000000 +0300
@@ -12,8 +12,8 @@
 		-I/usr/include \
 		-I/usr/local/include \
 		-D_GNU_SOURCE \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_HTTP
 
 # define the sources
@@ -33,8 +33,8 @@
 
 
 # define libraries
-wvhttpd_LDADD = -lssl -lcurl -lrad -lsqlite3 -lc -lm
+wvhttpd_LDADD = -lssl -lcurl -lrad -lsqlite3 -lc -lm -lmysqlclient
 
 # define library directories
-wvhttpd_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wvhttpd_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/Makefile.am wview-5.5.0-patch/Makefile.am
--- wview-5.5.0/Makefile.am	2009-05-14 14:57:21.000000000 +0300
+++ wview-5.5.0-patch/Makefile.am	2009-06-03 15:42:14.000000000 +0300
@@ -46,8 +46,8 @@
 endif
 endif
 
-WV_CONFIG_DIR 		= $(prefix)/etc/wview
-WV_RUN_DIR 		= $(prefix)/var/wview
+WV_CONFIG_DIR 		= $(DESTDIR)/etc/wview
+WV_RUN_DIR 		= $(DESTDIR)/var/run/wview
 
 
 # this target removes svn directories from the tarball
@@ -61,7 +61,7 @@
 	rm -f $(exec_prefix)/bin/wviewd
 	@echo "Removing OLD wview SQL daemon $(exec_prefix)/bin/wviewsqld"
 	rm -f $(exec_prefix)/bin/wviewsqld
-	@if [ ! -d $(WV_RUN_DIR) ]; then \
+	if [ ! -d $(WV_RUN_DIR) ]; then \
 		mkdir -p $(WV_RUN_DIR); \
 		mkdir -p $(WV_RUN_DIR)/noaa; \
 		mkdir -p $(WV_RUN_DIR)/alarms; \
diff -urN wview-5.5.0/procmon/Makefile.am wview-5.5.0-patch/procmon/Makefile.am
--- wview-5.5.0/procmon/Makefile.am	2009-04-20 02:02:30.000000000 +0300
+++ wview-5.5.0-patch/procmon/Makefile.am	2009-06-03 11:48:17.000000000 +0300
@@ -10,8 +10,8 @@
 		-I$(top_srcdir)/common \
 		-I$(prefix)/include \
 		-D_GNU_SOURCE \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_WVPMOND
 
 # define the sources
@@ -28,8 +28,8 @@
 
 
 # define libraries
-wvpmond_LDADD = -lc -lm -lrad -lsqlite3
+wvpmond_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-wvpmond_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wvpmond_LDFLAGS = -L@libidir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/ssh/Makefile.am wview-5.5.0-patch/ssh/Makefile.am
--- wview-5.5.0/ssh/Makefile.am	2009-04-20 02:02:44.000000000 +0300
+++ wview-5.5.0-patch/ssh/Makefile.am	2009-06-03 11:48:42.000000000 +0300
@@ -8,8 +8,8 @@
 # define include directories
 INCLUDES = 	-I$(top_srcdir)/common \
 		-I$(prefix)/include \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-D_GNU_SOURCE
 
 # define the sources
@@ -28,8 +28,8 @@
 
 
 # define libraries
-wviewsshd_LDADD = -lc -lm -lrad -lsqlite3
+wviewsshd_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-wviewsshd_LDFLAGS = -L$(prefix)/lib
+wviewsshd_LDFLAGS = -L@libdir@ -L$(prefix)/lib
 
diff -urN wview-5.5.0/stations/Simulator/Makefile.am wview-5.5.0-patch/stations/Simulator/Makefile.am
--- wview-5.5.0/stations/Simulator/Makefile.am	2009-04-20 02:03:02.000000000 +0300
+++ wview-5.5.0-patch/stations/Simulator/Makefile.am	2009-06-03 12:20:30.000000000 +0300
@@ -10,8 +10,8 @@
 		-I$(prefix)/include \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
 		-D_GNU_SOURCE \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_WVIEWD
 
 # define the sources
@@ -48,8 +48,8 @@
 		$(top_srcdir)/stations/Simulator/simulator.h
 
 # define libraries
-wviewd_sim_LDADD = -lc -lm -lrad -lsqlite3
+wviewd_sim_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-wviewd_sim_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wviewd_sim_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/stations/Simulator/simulator.c wview-5.5.0-patch/stations/Simulator/simulator.c
--- wview-5.5.0/stations/Simulator/simulator.c	2009-02-05 16:43:18.000000000 +0200
+++ wview-5.5.0-patch/stations/Simulator/simulator.c	2009-06-03 12:20:50.000000000 +0300
@@ -1,410 +1,410 @@
-/*---------------------------------------------------------------------------
- 
- FILENAME:
- simulator.c
- 
- PURPOSE:
- Provide the station simulator interface API and utilities.
- 
- REVISION HISTORY:
- Date Engineer Revision Remarks
- 01/19/2006 M.S. Teel 0 Original
- 
- NOTES:
- 
- 
- LICENSE:
- Copyright (c) 2006, Mark S. Teel (mark@teel.ws)
- 
- This source code is released for free distribution under the terms 
- of the GNU General Public License.
- 
-----------------------------------------------------------------------------*/
-
-/* ... System include files
-*/
-
-/* ... Library include files
-*/
-
-/* ... Local include files
-*/
-#include <simulator.h>
-
-/* ... global memory declarations
-*/
-
-/* ... local memory
-*/
-#define PI 3.1415926535897932384626433832795
-#define RAD (PI/180.0)
-#define PERIOD_FACTOR 4
-
-#if HOST_IS_BIGENDIAN
-#define SHORT_SWAP(x) (((x << 8) & 0xFF00) | ((x >> 8) & 0x00FF))
-#else
-#define SHORT_SWAP(x) (x)
-#endif
-
-static SIMULATOR_IF_DATA simWorkData;
-static void (*ArchiveIndicator) (ARCHIVE_PKT* newRecord);
-static int DataGenerator;
-
-static void serialPortConfig (int fd);
-static void storeLoopPkt (WVIEWD_WORK *work, LOOP_PKT *dest);
-
-
-
-////////////****////**** S T A T I O N A P I ****////****////////////
-///// Must be provided by each supported wview station interface //////
-
-// station-supplied init function
-// -- Can Be Asynchronous - event indication required --
-//
-// MUST:
-// - set the 'stationGeneratesArchives' flag in WVIEWD_WORK:
-// if the station generates archive records (TRUE) or they should be 
-// generated automatically by the daemon from the sensor readings (FALSE)
-// - Initialize the 'stationData' store for station work area
-// - Initialize the interface medium
-// - do initial LOOP acquisition
-// - do any catch-up on archive records if there is a data logger
-// - 'work->runningFlag' can be used for start up synchronization but should 
-// not be modified by the station interface code
-// - indicate init is done by sending the STATION_INIT_COMPLETE_EVENT event to
-// this process (radProcessEventsSend (NULL, STATION_INIT_COMPLETE_EVENT, 0))
-//
-// OPTIONAL:
-// - Initialize a state machine or any other construct required for the 
-// station interface - these should be stored in the 'stationData' store
-//
-// 'archiveIndication' - indication callback used to pass back an archive record
-// generated as a result of 'stationGetArchive' being called; should receive a
-// NULL pointer for 'newRecord' if no record available; only used if 
-// 'stationGeneratesArchives' flag is set to TRUE by the station interface
-//
-// Returns: OK or ERROR
-//
-int stationInit
-(
- WVIEWD_WORK *work,
- void (*archiveIndication)(ARCHIVE_PKT* newRecord)
-)
-{
- int minutes;
-
- memset (&simWorkData, 0, sizeof(simWorkData));
-
- // save the archive indication callback (we should never need it)
- ArchiveIndicator = archiveIndication;
-
- // set our work data pointer
- work->stationData = &simWorkData;
-
- // set the Archive Generation flag to indicate the Simulator DOES NOT 
- // generate them
- work->stationGeneratesArchives = FALSE;
-
- // initialize the medium abstraction based on user configuration
- // we just set the fd to -1 so it is not used for select - 
- // we won't really open a serial channel...
- work->medium.fd = -1;
-
- // grab the station configuration now
- if (stationGetConfigValueInt (work, 
- STATION_PARM_ELEVATION, 
- &simWorkData.elevation) 
- == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt ELEV failed!");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
- if (stationGetConfigValueFloat (work, 
- STATION_PARM_LATITUDE, 
- &simWorkData.latitude) 
- == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt LAT failed!");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
- if (stationGetConfigValueFloat (work, 
- STATION_PARM_LONGITUDE, 
- &simWorkData.longitude) 
- == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt LONG failed!");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
- if (stationGetConfigValueInt (work, 
- STATION_PARM_ARC_INTERVAL, 
- &simWorkData.archiveInterval) 
- == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt ARCINT failed!");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
-
- // set the work archive interval now
- work->archiveInterval = simWorkData.archiveInterval;
-
- // sanity check the archive interval against the most recent record
- if (stationVerifyArchiveInterval (work) == ERROR)
- {
- // bad magic!
- radMsgLog (PRI_HIGH, "stationInit: stationVerifyArchiveInterval failed!");
- radMsgLog (PRI_HIGH, "You must either move old /var/wview/archive files out of the way -or-");
- radMsgLog (PRI_HIGH, "fix the wview.conf setting...");
- return ERROR;
- }
- else
- {
- radMsgLog (PRI_STATUS, "station archive interval: %d minutes",
- work->archiveInterval);
- }
-
-
- // initialize the station interface
- // nothing to do here...
-
-
- // do the initial GetReadings now
- // populate the LOOP structure
- storeLoopPkt (work, &work->loopPkt);
-
- // compute the data generation period
- minutes = 360 * PERIOD_FACTOR;
- minutes *= (work->cdataInterval/1000);
- minutes /= 60;
-
- radMsgLog (PRI_STATUS, "Simulator station opened: %d minute data generation period...",
- minutes);
-
- // we can indicate successful completion here!
- radProcessEventsSend (NULL, STATION_INIT_COMPLETE_EVENT, 0);
-
- return OK;
-}
-
-// station-supplied exit function
-//
-// Returns: N/A
-//
-void stationExit (WVIEWD_WORK *work)
-{
- return;
-}
-
-// station-supplied function to retrieve positional info (lat, long, elev) -
-// should populate 'work' fields: latitude, longitude, elevation
-// -- Synchronous --
-//
-// - If station does not store these parameters, they can be retrieved from the
-// wview.conf file (see daemon.c for example conf file use) - user must choose
-// station type "Generic" when running the wviewconfig script
-//
-// Returns: OK or ERROR
-//
-int stationGetPosition (WVIEWD_WORK *work)
-{
- // just set the values from our internal store - we retrieved them in
- // stationInit
- work->elevation = (short)simWorkData.elevation;
- if (simWorkData.latitude >= 0)
- work->latitude = (short)((simWorkData.latitude*10)+0.5);
- else
- work->latitude = (short)((simWorkData.latitude*10)-0.5);
- if (simWorkData.longitude >= 0)
- work->longitude = (short)((simWorkData.longitude*10)+0.5);
- else
- work->longitude = (short)((simWorkData.longitude*10)-0.5);
- 
- radMsgLog (PRI_STATUS, "station location: elevation: %d feet",
- work->elevation);
-
- radMsgLog (PRI_STATUS, "station location: latitude: %3.1f %c longitude: %3.1f %c",
- (float)abs(work->latitude)/10.0,
- ((work->latitude < 0) ? 'S' : 'N'),
- (float)abs(work->longitude)/10.0,
- ((work->longitude < 0) ? 'W' : 'E'));
-
- return OK;
-}
-
-// station-supplied function to indicate a time sync should be performed if the
-// station maintains time, otherwise may be safely ignored
-// -- Can Be Asynchronous --
-//
-// Returns: OK or ERROR
-//
-int stationSyncTime (WVIEWD_WORK *work)
-{
- // Simulator does not keep time...
- return OK;
-}
-
-// station-supplied function to indicate sensor readings should be performed -
-// should populate 'work' struct: loopPkt (see datadefs.h for minimum field reqs)
-// -- Can Be Asynchronous --
-//
-// - indicate readings are complete by sending the STATION_LOOP_COMPLETE_EVENT
-// event to this process (radProcessEventsSend (NULL, STATION_LOOP_COMPLETE_EVENT, 0))
-//
-// Returns: OK or ERROR
-//
-int stationGetReadings (WVIEWD_WORK *work)
-{
- // we will do this synchronously...
-
- // populate the LOOP structure (with dummy data)
- storeLoopPkt (work, &work->loopPkt);
-
- // indicate we are done
- radProcessEventsSend (NULL, STATION_LOOP_COMPLETE_EVENT, 0);
- 
- return OK;
-}
-
-// station-supplied function to indicate an archive record should be generated -
-// MUST populate an ARCHIVE_RECORD struct and indicate it to 'archiveIndication'
-// function passed into 'stationInit'
-// -- Asynchronous - callback indication required --
-//
-// Returns: OK or ERROR
-//
-// Note: 'archiveIndication' should receive a NULL pointer for the newRecord if
-// no record is available
-// Note: This function will only be invoked by the wview daemon if the 
-// 'stationInit' function set the 'stationGeneratesArchives' to TRUE
-//
-int stationGetArchive (WVIEWD_WORK *work)
-{
- // just indicate a NULL record, Simulator does not generate them (and this 
- // function should never be called!)
- (*ArchiveIndicator) (NULL);
- return OK;
-}
-
-// station-supplied function to indicate data is available on the station 
-// interface medium (serial or ethernet) -
-// It is the responsibility of the station interface to read the data from the 
-// medium and process appropriately. The data does not have to be read within
-// the context of this function, but may be used to stimulate a state machine.
-// -- Synchronous --
-//
-// Returns: N/A
-//
-void stationDataIndicate (WVIEWD_WORK *work)
-{
- // Simulator station is synchronous...
- return;
-}
-
-// station-supplied function to indicate the interface timer has expired -
-// It is the responsibility of the station interface to start/stop the interface
-// timer as needed for the particular station requirements.
-// The station interface timer is specified by the 'ifTimer' member of the
-// WVIEWD_WORK structure. No other timers in that structure should be manipulated
-// in any way by the station interface code.
-// -- Synchronous --
-//
-// Returns: N/A
-//
-void stationIFTimerExpiry (WVIEWD_WORK *work)
-{
- // Simulator station is synchronous...
- return;
-}
-
-////////////****//// S T A T I O N A P I E N D ////****////////////
-
-
-// ... ----- static (local) methods ----- ...
-
-static void storeLoopPkt (WVIEWD_WORK *work, LOOP_PKT *dest)
-{
- float tempfloat;
-
- // Clear optional data:
- stationClearOptionalLoopData(work);
-
-
- // vary BP from 29.75 to 30.25
- tempfloat = 30.00;
- tempfloat += sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 0.25;
- // Sim "produces" sea level pressure (SLP)
- dest->barometer = tempfloat;
-
- // vary TEMP from 60 to 80
- tempfloat = 70;
- tempfloat += sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 10.0;
- dest->outTemp = tempfloat;
-
- // Apply calibration here so the computed values reflect it:
- dest->barometer *= work->calMBarometer;
- dest->barometer += work->calCBarometer;
-
- // calculate station pressure by giving a negative elevation 
- dest->stationPressure = wvutilsConvertSPToSLP(dest->barometer, 
- dest->outTemp,
- (float)(-simWorkData.elevation));
-
- // calculate altimeter
- dest->altimeter = wvutilsConvertSPToAltimeter(dest->stationPressure,
- (float)simWorkData.elevation);
-
- // vary HUMIDITY from 60 to 80
- tempfloat = 70.0;
- tempfloat -= sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 10.0;
- dest->outHumidity = (USHORT)tempfloat;
-
- // vary WINDSPD from 5 to 15
- tempfloat = 10;
- tempfloat += sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 5.0;
- dest->windSpeed = (USHORT)tempfloat;
-
- // vary WINDDIR from 0 to 90
- tempfloat = 0;
- tempfloat += fabsf(sin((float)DataGenerator*RAD/PERIOD_FACTOR)) * 90.0;
- dest->windDir = (USHORT)tempfloat;
-
- // vary MAXWIND from 15 to 25
- tempfloat = 20;
- tempfloat += sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 5.0;
- dest->windGust = (USHORT)tempfloat;
-
- // vary MAXWINDDIR from 0 to 90
- tempfloat = 45;
- tempfloat += sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 45.0;
- dest->windGustDir = (USHORT)tempfloat;
-
- // vary RAINRATE from 0.00 to 4.8
- tempfloat = 0;
- tempfloat += fabsf(sin((float)DataGenerator*RAD/PERIOD_FACTOR)) * 4.8;
- dest->rainRate = tempfloat;
-
- // vary RAIN from 0.00 to 0.02
- tempfloat = 0;
- tempfloat += fabsf(sin((float)DataGenerator*RAD/PERIOD_FACTOR)) * 0.02;
- dest->sampleRain = tempfloat;
-
-
- // now calculate a few
- dest->dewpoint = wvutilsCalculateDewpoint (dest->outTemp, 
- (float)dest->outHumidity);
- dest->windchill = wvutilsCalculateWindChill (dest->outTemp, 
- (float)dest->windSpeed);
- dest->heatindex = wvutilsCalculateHeatIndex (dest->outTemp, 
- (float)dest->outHumidity);
-
-
- // bump our data generator index
- DataGenerator ++;
- DataGenerator %= (360*PERIOD_FACTOR);
- 
- return;
-}
-
+/*---------------------------------------------------------------------------
+ 
+ FILENAME:
+ simulator.c
+ 
+ PURPOSE:
+ Provide the station simulator interface API and utilities.
+ 
+ REVISION HISTORY:
+ Date Engineer Revision Remarks
+ 01/19/2006 M.S. Teel 0 Original
+ 
+ NOTES:
+ 
+ 
+ LICENSE:
+ Copyright (c) 2006, Mark S. Teel (mark@teel.ws)
+ 
+ This source code is released for free distribution under the terms 
+ of the GNU General Public License.
+ 
+----------------------------------------------------------------------------*/
+
+/* ... System include files
+*/
+
+/* ... Library include files
+*/
+
+/* ... Local include files
+*/
+#include <simulator.h>
+
+/* ... global memory declarations
+*/
+
+/* ... local memory
+*/
+#define PI 3.1415926535897932384626433832795
+#define RAD (PI/180.0)
+#define PERIOD_FACTOR 4
+
+#if HOST_IS_BIGENDIAN
+#define SHORT_SWAP(x) (((x << 8) & 0xFF00) | ((x >> 8) & 0x00FF))
+#else
+#define SHORT_SWAP(x) (x)
+#endif
+
+static SIMULATOR_IF_DATA simWorkData;
+static void (*ArchiveIndicator) (ARCHIVE_PKT* newRecord);
+static int DataGenerator;
+
+static void serialPortConfig (int fd);
+static void storeLoopPkt (WVIEWD_WORK *work, LOOP_PKT *dest);
+
+
+
+////////////****////**** S T A T I O N A P I ****////****////////////
+///// Must be provided by each supported wview station interface //////
+
+// station-supplied init function
+// -- Can Be Asynchronous - event indication required --
+//
+// MUST:
+// - set the 'stationGeneratesArchives' flag in WVIEWD_WORK:
+// if the station generates archive records (TRUE) or they should be 
+// generated automatically by the daemon from the sensor readings (FALSE)
+// - Initialize the 'stationData' store for station work area
+// - Initialize the interface medium
+// - do initial LOOP acquisition
+// - do any catch-up on archive records if there is a data logger
+// - 'work->runningFlag' can be used for start up synchronization but should 
+// not be modified by the station interface code
+// - indicate init is done by sending the STATION_INIT_COMPLETE_EVENT event to
+// this process (radProcessEventsSend (NULL, STATION_INIT_COMPLETE_EVENT, 0))
+//
+// OPTIONAL:
+// - Initialize a state machine or any other construct required for the 
+// station interface - these should be stored in the 'stationData' store
+//
+// 'archiveIndication' - indication callback used to pass back an archive record
+// generated as a result of 'stationGetArchive' being called; should receive a
+// NULL pointer for 'newRecord' if no record available; only used if 
+// 'stationGeneratesArchives' flag is set to TRUE by the station interface
+//
+// Returns: OK or ERROR
+//
+int stationInit
+(
+ WVIEWD_WORK *work,
+ void (*archiveIndication)(ARCHIVE_PKT* newRecord)
+)
+{
+ int minutes;
+
+ memset (&simWorkData, 0, sizeof(simWorkData));
+
+ // save the archive indication callback (we should never need it)
+ ArchiveIndicator = archiveIndication;
+
+ // set our work data pointer
+ work->stationData = &simWorkData;
+
+ // set the Archive Generation flag to indicate the Simulator DOES NOT 
+ // generate them
+ work->stationGeneratesArchives = FALSE;
+
+ // initialize the medium abstraction based on user configuration
+ // we just set the fd to -1 so it is not used for select - 
+ // we won't really open a serial channel...
+ work->medium.fd = -1;
+
+ // grab the station configuration now
+ if (stationGetConfigValueInt (work, 
+ STATION_PARM_ELEVATION, 
+ &simWorkData.elevation) 
+ == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt ELEV failed!");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+ if (stationGetConfigValueFloat (work, 
+ STATION_PARM_LATITUDE, 
+ &simWorkData.latitude) 
+ == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt LAT failed!");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+ if (stationGetConfigValueFloat (work, 
+ STATION_PARM_LONGITUDE, 
+ &simWorkData.longitude) 
+ == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt LONG failed!");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+ if (stationGetConfigValueInt (work, 
+ STATION_PARM_ARC_INTERVAL, 
+ &simWorkData.archiveInterval) 
+ == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt ARCINT failed!");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+
+ // set the work archive interval now
+ work->archiveInterval = simWorkData.archiveInterval;
+
+ // sanity check the archive interval against the most recent record
+ if (stationVerifyArchiveInterval (work) == ERROR)
+ {
+ // bad magic!
+ radMsgLog (PRI_HIGH, "stationInit: stationVerifyArchiveInterval failed!");
+ radMsgLog (PRI_HIGH, "You must either move old /var/run/wview/archive files out of the way -or-");
+ radMsgLog (PRI_HIGH, "fix the wview.conf setting...");
+ return ERROR;
+ }
+ else
+ {
+ radMsgLog (PRI_STATUS, "station archive interval: %d minutes",
+ work->archiveInterval);
+ }
+
+
+ // initialize the station interface
+ // nothing to do here...
+
+
+ // do the initial GetReadings now
+ // populate the LOOP structure
+ storeLoopPkt (work, &work->loopPkt);
+
+ // compute the data generation period
+ minutes = 360 * PERIOD_FACTOR;
+ minutes *= (work->cdataInterval/1000);
+ minutes /= 60;
+
+ radMsgLog (PRI_STATUS, "Simulator station opened: %d minute data generation period...",
+ minutes);
+
+ // we can indicate successful completion here!
+ radProcessEventsSend (NULL, STATION_INIT_COMPLETE_EVENT, 0);
+
+ return OK;
+}
+
+// station-supplied exit function
+//
+// Returns: N/A
+//
+void stationExit (WVIEWD_WORK *work)
+{
+ return;
+}
+
+// station-supplied function to retrieve positional info (lat, long, elev) -
+// should populate 'work' fields: latitude, longitude, elevation
+// -- Synchronous --
+//
+// - If station does not store these parameters, they can be retrieved from the
+// wview.conf file (see daemon.c for example conf file use) - user must choose
+// station type "Generic" when running the wviewconfig script
+//
+// Returns: OK or ERROR
+//
+int stationGetPosition (WVIEWD_WORK *work)
+{
+ // just set the values from our internal store - we retrieved them in
+ // stationInit
+ work->elevation = (short)simWorkData.elevation;
+ if (simWorkData.latitude >= 0)
+ work->latitude = (short)((simWorkData.latitude*10)+0.5);
+ else
+ work->latitude = (short)((simWorkData.latitude*10)-0.5);
+ if (simWorkData.longitude >= 0)
+ work->longitude = (short)((simWorkData.longitude*10)+0.5);
+ else
+ work->longitude = (short)((simWorkData.longitude*10)-0.5);
+ 
+ radMsgLog (PRI_STATUS, "station location: elevation: %d feet",
+ work->elevation);
+
+ radMsgLog (PRI_STATUS, "station location: latitude: %3.1f %c longitude: %3.1f %c",
+ (float)abs(work->latitude)/10.0,
+ ((work->latitude < 0) ? 'S' : 'N'),
+ (float)abs(work->longitude)/10.0,
+ ((work->longitude < 0) ? 'W' : 'E'));
+
+ return OK;
+}
+
+// station-supplied function to indicate a time sync should be performed if the
+// station maintains time, otherwise may be safely ignored
+// -- Can Be Asynchronous --
+//
+// Returns: OK or ERROR
+//
+int stationSyncTime (WVIEWD_WORK *work)
+{
+ // Simulator does not keep time...
+ return OK;
+}
+
+// station-supplied function to indicate sensor readings should be performed -
+// should populate 'work' struct: loopPkt (see datadefs.h for minimum field reqs)
+// -- Can Be Asynchronous --
+//
+// - indicate readings are complete by sending the STATION_LOOP_COMPLETE_EVENT
+// event to this process (radProcessEventsSend (NULL, STATION_LOOP_COMPLETE_EVENT, 0))
+//
+// Returns: OK or ERROR
+//
+int stationGetReadings (WVIEWD_WORK *work)
+{
+ // we will do this synchronously...
+
+ // populate the LOOP structure (with dummy data)
+ storeLoopPkt (work, &work->loopPkt);
+
+ // indicate we are done
+ radProcessEventsSend (NULL, STATION_LOOP_COMPLETE_EVENT, 0);
+ 
+ return OK;
+}
+
+// station-supplied function to indicate an archive record should be generated -
+// MUST populate an ARCHIVE_RECORD struct and indicate it to 'archiveIndication'
+// function passed into 'stationInit'
+// -- Asynchronous - callback indication required --
+//
+// Returns: OK or ERROR
+//
+// Note: 'archiveIndication' should receive a NULL pointer for the newRecord if
+// no record is available
+// Note: This function will only be invoked by the wview daemon if the 
+// 'stationInit' function set the 'stationGeneratesArchives' to TRUE
+//
+int stationGetArchive (WVIEWD_WORK *work)
+{
+ // just indicate a NULL record, Simulator does not generate them (and this 
+ // function should never be called!)
+ (*ArchiveIndicator) (NULL);
+ return OK;
+}
+
+// station-supplied function to indicate data is available on the station 
+// interface medium (serial or ethernet) -
+// It is the responsibility of the station interface to read the data from the 
+// medium and process appropriately. The data does not have to be read within
+// the context of this function, but may be used to stimulate a state machine.
+// -- Synchronous --
+//
+// Returns: N/A
+//
+void stationDataIndicate (WVIEWD_WORK *work)
+{
+ // Simulator station is synchronous...
+ return;
+}
+
+// station-supplied function to indicate the interface timer has expired -
+// It is the responsibility of the station interface to start/stop the interface
+// timer as needed for the particular station requirements.
+// The station interface timer is specified by the 'ifTimer' member of the
+// WVIEWD_WORK structure. No other timers in that structure should be manipulated
+// in any way by the station interface code.
+// -- Synchronous --
+//
+// Returns: N/A
+//
+void stationIFTimerExpiry (WVIEWD_WORK *work)
+{
+ // Simulator station is synchronous...
+ return;
+}
+
+////////////****//// S T A T I O N A P I E N D ////****////////////
+
+
+// ... ----- static (local) methods ----- ...
+
+static void storeLoopPkt (WVIEWD_WORK *work, LOOP_PKT *dest)
+{
+ float tempfloat;
+
+ // Clear optional data:
+ stationClearOptionalLoopData(work);
+
+
+ // vary BP from 29.75 to 30.25
+ tempfloat = 30.00;
+ tempfloat += sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 0.25;
+ // Sim "produces" sea level pressure (SLP)
+ dest->barometer = tempfloat;
+
+ // vary TEMP from 60 to 80
+ tempfloat = 70;
+ tempfloat += sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 10.0;
+ dest->outTemp = tempfloat;
+
+ // Apply calibration here so the computed values reflect it:
+ dest->barometer *= work->calMBarometer;
+ dest->barometer += work->calCBarometer;
+
+ // calculate station pressure by giving a negative elevation 
+ dest->stationPressure = wvutilsConvertSPToSLP(dest->barometer, 
+ dest->outTemp,
+ (float)(-simWorkData.elevation));
+
+ // calculate altimeter
+ dest->altimeter = wvutilsConvertSPToAltimeter(dest->stationPressure,
+ (float)simWorkData.elevation);
+
+ // vary HUMIDITY from 60 to 80
+ tempfloat = 70.0;
+ tempfloat -= sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 10.0;
+ dest->outHumidity = (USHORT)tempfloat;
+
+ // vary WINDSPD from 5 to 15
+ tempfloat = 10;
+ tempfloat += sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 5.0;
+ dest->windSpeed = (USHORT)tempfloat;
+
+ // vary WINDDIR from 0 to 90
+ tempfloat = 0;
+ tempfloat += fabsf(sin((float)DataGenerator*RAD/PERIOD_FACTOR)) * 90.0;
+ dest->windDir = (USHORT)tempfloat;
+
+ // vary MAXWIND from 15 to 25
+ tempfloat = 20;
+ tempfloat += sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 5.0;
+ dest->windGust = (USHORT)tempfloat;
+
+ // vary MAXWINDDIR from 0 to 90
+ tempfloat = 45;
+ tempfloat += sin((float)DataGenerator*RAD/PERIOD_FACTOR) * 45.0;
+ dest->windGustDir = (USHORT)tempfloat;
+
+ // vary RAINRATE from 0.00 to 4.8
+ tempfloat = 0;
+ tempfloat += fabsf(sin((float)DataGenerator*RAD/PERIOD_FACTOR)) * 4.8;
+ dest->rainRate = tempfloat;
+
+ // vary RAIN from 0.00 to 0.02
+ tempfloat = 0;
+ tempfloat += fabsf(sin((float)DataGenerator*RAD/PERIOD_FACTOR)) * 0.02;
+ dest->sampleRain = tempfloat;
+
+
+ // now calculate a few
+ dest->dewpoint = wvutilsCalculateDewpoint (dest->outTemp, 
+ (float)dest->outHumidity);
+ dest->windchill = wvutilsCalculateWindChill (dest->outTemp, 
+ (float)dest->windSpeed);
+ dest->heatindex = wvutilsCalculateHeatIndex (dest->outTemp, 
+ (float)dest->outHumidity);
+
+
+ // bump our data generator index
+ DataGenerator ++;
+ DataGenerator %= (360*PERIOD_FACTOR);
+ 
+ return;
+}
+
diff -urN wview-5.5.0/stations/VantagePro/Makefile.am wview-5.5.0-patch/stations/VantagePro/Makefile.am
--- wview-5.5.0/stations/VantagePro/Makefile.am	2009-04-20 02:03:22.000000000 +0300
+++ wview-5.5.0-patch/stations/VantagePro/Makefile.am	2009-06-03 12:22:20.000000000 +0300
@@ -12,8 +12,8 @@
 		-I$(prefix)/include \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
 		-D_GNU_SOURCE \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_WVIEWD
 
 # define the sources
@@ -52,8 +52,8 @@
 		$(top_srcdir)/stations/VantagePro/Ccitt.h
 
 # define libraries
-wviewd_vpro_LDADD = -lc -lm -lrad -lsqlite3 -lsqlite3
+wviewd_vpro_LDADD = -lc -lm -lrad -lsqlite3 -lsqlite3 -lmysqlclient
 
 # define library directories
-wviewd_vpro_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wviewd_vpro_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/stations/VantagePro/vpconfig/Makefile.am wview-5.5.0-patch/stations/VantagePro/vpconfig/Makefile.am
--- wview-5.5.0/stations/VantagePro/vpconfig/Makefile.am	2009-04-20 02:03:58.000000000 +0300
+++ wview-5.5.0-patch/stations/VantagePro/vpconfig/Makefile.am	2009-06-03 11:39:16.000000000 +0300
@@ -14,8 +14,8 @@
 		-I$(top_srcdir)/stations/common \
 		-I$(top_srcdir)/stations/VantagePro \
 		-I$(prefix)/include \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
 		-D_VP_CONFIG_ONLY \
 		-D_GNU_SOURCE
@@ -38,10 +38,10 @@
 		$(top_srcdir)/stations/VantagePro/vpconfig/vpconfig.c
 
 # define libraries
-vpconfig_LDADD = -lc -lm -lrad -lsqlite3
+vpconfig_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-vpconfig_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+vpconfig_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
 CLEANFILES = $(bin_SCRIPTS)
 
diff -urN wview-5.5.0/stations/VantagePro/vpconfig/vpinstall.sh wview-5.5.0-patch/stations/VantagePro/vpconfig/vpinstall.sh
--- wview-5.5.0/stations/VantagePro/vpconfig/vpinstall.sh	2009-02-05 07:09:29.000000000 +0200
+++ wview-5.5.0-patch/stations/VantagePro/vpconfig/vpinstall.sh	2009-06-03 12:22:50.000000000 +0300
@@ -19,7 +19,7 @@
 SCRIPTNAME=vpinstall
 SCRIPTNAME_VERSION="1.0.1"
 
-WVIEWD_PID=/var/wview/wviewd.pid
+WVIEWD_PID=/var/run/wview/wviewd.pid
 VPCONFIG_BIN=$WVIEW_INSTALL_DIR/vpconfig
 test -x $VPCONFIG_BIN || (echo "vpconfig not installed!"; exit 2)
 
@@ -243,7 +243,7 @@
 echo "first time so the Vantage Pro can become consistent with the new settings..."
 echo ""
 echo "In the meantime, be sure you have deleted any archive files in"
-echo "/var/wview/archive if you have changed the archive interval..."
+echo "/var/run/wview/archive if you have changed the archive interval..."
 echo ""
 echo "Vantage Pro configuration complete!"
 echo ""
diff -urN wview-5.5.0/stations/VantagePro/vproStates.c wview-5.5.0-patch/stations/VantagePro/vproStates.c
--- wview-5.5.0/stations/VantagePro/vproStates.c	2009-03-08 09:23:08.000000000 +0200
+++ wview-5.5.0-patch/stations/VantagePro/vproStates.c	2009-06-03 12:21:57.000000000 +0300
@@ -110,7 +110,7 @@
 if (stationVerifyArchiveInterval (work) == ERROR)
 {
 radMsgLog (PRI_HIGH, "vproStartProcState: stationVerifyArchiveInterval failed!");
- radMsgLog (PRI_HIGH, "You must either move old /var/wview/archive files out of the way -or-");
+ radMsgLog (PRI_HIGH, "You must either move old /var/run/wview/archive files out of the way -or-");
 radMsgLog (PRI_HIGH, "fix the station setting...");
 radProcessEventsSend (NULL, STATION_INIT_COMPLETE_EVENT, 1);
 emailAlertSend(ALERT_TYPE_STATION_IF);
diff -urN wview-5.5.0/stations/WMR918/Makefile.am wview-5.5.0-patch/stations/WMR918/Makefile.am
--- wview-5.5.0/stations/WMR918/Makefile.am	2009-04-20 02:04:16.000000000 +0300
+++ wview-5.5.0-patch/stations/WMR918/Makefile.am	2009-06-03 12:23:11.000000000 +0300
@@ -10,8 +10,8 @@
 		-I$(prefix)/include \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
 		-D_GNU_SOURCE \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_WVIEWD
 
 # define the sources
@@ -52,8 +52,8 @@
 		$(top_srcdir)/stations/WMR918/wmr918protocol.h
 
 # define libraries
-wviewd_wmr918_LDADD = -lc -lm -lrad -lsqlite3
+wviewd_wmr918_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-wviewd_wmr918_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wviewd_wmr918_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/stations/WMR918/wmr918Interface.c wview-5.5.0-patch/stations/WMR918/wmr918Interface.c
--- wview-5.5.0/stations/WMR918/wmr918Interface.c	2009-04-29 06:32:45.000000000 +0300
+++ wview-5.5.0-patch/stations/WMR918/wmr918Interface.c	2009-06-03 12:23:53.000000000 +0300
@@ -1,402 +1,402 @@
-/*---------------------------------------------------------------------------
- 
- FILENAME:
- ws2300Interface.c
- 
- PURPOSE:
- Provide the Oregon Scientific WMR918 station interface API and utilities.
- 
- REVISION HISTORY:
- Date Engineer Revision Remarks
- 04/09/2008 M.S. Teel 0 Original
- 
- NOTES:
- 
- 
- LICENSE:
- Copyright (c) 2008, Mark S. Teel (mark@teel.ws)
- 
- This source code is released for free distribution under the terms 
- of the GNU General Public License.
- 
-----------------------------------------------------------------------------*/
-
-/* ... System include files
-*/
-
-/* ... Library include files
-*/
-
-/* ... Local include files
-*/
-#include <wmr918Interface.h>
-
-/* ... global memory declarations
-*/
-
-/* ... local memory
-*/
-
-#if HOST_IS_BIGENDIAN
-#define SHORT_SWAP(x) (((x << 8) & 0xFF00) | ((x >> 8) & 0x00FF))
-#else
-#define SHORT_SWAP(x) (x)
-#endif
-
-static WMR918_IF_DATA wmr918WorkData;
-static void (*ArchiveIndicator) (ARCHIVE_PKT* newRecord);
-
-static void serialPortConfig (int fd);
-
-
-
-////////////****////**** S T A T I O N A P I ****////****////////////
-///// Must be provided by each supported wview station interface //////
-
-// station-supplied init function
-// -- Can Be Asynchronous - event indication required --
-//
-// MUST:
-// - set the 'stationGeneratesArchives' flag in WVIEWD_WORK:
-// if the station generates archive records (TRUE) or they should be
-// generated automatically by the daemon from the sensor readings (FALSE)
-// - Initialize the 'stationData' store for station work area
-// - Initialize the interface medium
-// - do initial LOOP acquisition
-// - do any catch-up on archive records if there is a data logger
-// - 'work->runningFlag' can be used for start up synchronization but should
-// not be modified by the station interface code
-// - indicate init is done by sending the STATION_INIT_COMPLETE_EVENT event to
-// this process (radProcessEventsSend (NULL, STATION_INIT_COMPLETE_EVENT, 0))
-//
-// OPTIONAL:
-// - Initialize a state machine or any other construct required for the
-// station interface - these should be stored in the 'stationData' store
-//
-// 'archiveIndication' - indication callback used to pass back an archive record
-// generated as a result of 'stationGetArchive' being called; should receive a
-// NULL pointer for 'newRecord' if no record available; only used if
-// 'stationGeneratesArchives' flag is set to TRUE by the station interface
-//
-// Returns: OK or ERROR
-//
-int stationInit
-(
- WVIEWD_WORK *work,
- void (*archiveIndication)(ARCHIVE_PKT* newRecord)
-)
-{
- int i;
- STIM stim;
-
- memset (&wmr918WorkData, 0, sizeof(wmr918WorkData));
-
- // save the archive indication callback (we should never need it)
- ArchiveIndicator = archiveIndication;
-
- // set our work data pointer
- work->stationData = &wmr918WorkData;
-
- // set the Archive Generation flag to indicate the WMR918 DOES NOT
- // generate them
- work->stationGeneratesArchives = FALSE;
-
- // initialize the medium abstraction based on user configuration
- if (!strcmp (work->stationInterface, "serial"))
- {
- if (serialMediumInit (&work->medium, serialPortConfig, O_RDONLY | O_NOCTTY | O_NDELAY) == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: serial MediumInit failed");
- return ERROR;
- }
- }
- else if (!strcmp (work->stationInterface, "ethernet"))
- {
- if (ethernetMediumInit (&work->medium, work->stationHost, work->stationPort)
- == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: ethernet MediumInit failed");
- return ERROR;
- }
- }
- else
- {
- radMsgLog (PRI_HIGH, "stationInit: medium %s not supported",
- work->stationInterface);
- return ERROR;
- }
-
- // initialize the interface using the media specific routine
- if ((*(work->medium.init)) (&work->medium, work->stationDevice) == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: medium setup failed");
- return ERROR;
- }
-
- if (!strcmp (work->stationInterface, "serial"))
- {
- radMsgLog (PRI_STATUS, "WMR918 on %s opened ...",
- work->stationDevice);
- }
- else if (!strcmp (work->stationInterface, "ethernet"))
- {
- radMsgLog (PRI_STATUS, "WMR918 on %s:%d opened ...",
- work->stationHost, work->stationPort);
- }
-
- // grab the station configuration now
- if (stationGetConfigValueInt (work,
- STATION_PARM_ELEVATION,
- &wmr918WorkData.elevation)
- == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt ELEV failed!");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
- if (stationGetConfigValueFloat (work,
- STATION_PARM_LATITUDE,
- &wmr918WorkData.latitude)
- == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt LAT failed!");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
- if (stationGetConfigValueFloat (work,
- STATION_PARM_LONGITUDE,
- &wmr918WorkData.longitude)
- == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt LONG failed!");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
- if (stationGetConfigValueInt (work,
- STATION_PARM_ARC_INTERVAL,
- &wmr918WorkData.archiveInterval)
- == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt ARCINT failed!");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
- if (stationGetConfigValueInt (work,
- STATION_PARM_OUTSIDE_CHANNEL,
- &wmr918WorkData.outsideChannel)
- == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt outside channel failed!");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
-
- // set the work archive interval now
- work->archiveInterval = wmr918WorkData.archiveInterval;
-
- // sanity check the archive interval against the most recent record
- if (stationVerifyArchiveInterval (work) == ERROR)
- {
- // bad magic!
- radMsgLog (PRI_HIGH, "stationInit: stationVerifyArchiveInterval failed!");
- radMsgLog (PRI_HIGH, "You must either move old /var/wview/archive files out of the way -or-");
- radMsgLog (PRI_HIGH, "fix the wview.conf setting...");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
- else
- {
- radMsgLog (PRI_STATUS, "station archive interval: %d minutes",
- work->archiveInterval);
- }
-
- if (wmr918Init (work) == ERROR)
- {
- radMsgLog (PRI_HIGH, "stationInit: wmr918Init failed!");
- (*(work->medium.exit)) (&work->medium);
- return ERROR;
- }
-
- return OK;
-}
-
-// station-supplied exit function
-//
-// Returns: N/A
-//
-void stationExit (WVIEWD_WORK *work)
-{
- wmr918Exit (work);
- (*(work->medium.exit)) (&work->medium);
-
- return;
-}
-
-// station-supplied function to retrieve positional info (lat, long, elev) -
-// should populate 'work' fields: latitude, longitude, elevation
-// -- Synchronous --
-//
-// - If station does not store these parameters, they can be retrieved from the
-// wview.conf file (see daemon.c for example conf file use) - user must choose
-// station type "Generic" when running the wviewconfig script
-//
-// Returns: OK or ERROR
-//
-int stationGetPosition (WVIEWD_WORK *work)
-{
- // just set the values from our internal store - we retrieved them in
- // stationInit
- work->elevation = (short)wmr918WorkData.elevation;
- if (wmr918WorkData.latitude >= 0)
- work->latitude = (short)((wmr918WorkData.latitude*10)+0.5);
- else
- work->latitude = (short)((wmr918WorkData.latitude*10)-0.5);
- if (wmr918WorkData.longitude >= 0)
- work->longitude = (short)((wmr918WorkData.longitude*10)+0.5);
- else
- work->longitude = (short)((wmr918WorkData.longitude*10)-0.5);
-
- radMsgLog (PRI_STATUS, "station location: elevation: %d feet",
- work->elevation);
-
- radMsgLog (PRI_STATUS, "station location: latitude: %3.1f %c longitude: %3.1f %c",
- (float)abs(work->latitude)/10.0,
- ((work->latitude < 0) ? 'S' : 'N'),
- (float)abs(work->longitude)/10.0,
- ((work->longitude < 0) ? 'W' : 'E'));
-
- return OK;
-}
-
-// station-supplied function to indicate a time sync should be performed if the
-// station maintains time, otherwise may be safely ignored
-// -- Can Be Asynchronous --
-//
-// Returns: OK or ERROR
-//
-int stationSyncTime (WVIEWD_WORK *work)
-{
- // We don't use the WMR918 time...
- return OK;
-}
-
-// station-supplied function to indicate sensor readings should be performed -
-// should populate 'work' struct: loopPkt (see datadefs.h for minimum field reqs)
-// -- Can Be Asynchronous --
-//
-// - indicate readings are complete by sending the STATION_LOOP_COMPLETE_EVENT
-// event to this process (radProcessEventsSend (NULL, STATION_LOOP_COMPLETE_EVENT, 0))
-//
-// Returns: OK or ERROR
-//
-int stationGetReadings (WVIEWD_WORK *work)
-{
- wmr918GetReadings (work);
-
- return OK;
-}
-
-// station-supplied function to indicate an archive record should be generated -
-// MUST populate an ARCHIVE_RECORD struct and indicate it to 'archiveIndication'
-// function passed into 'stationInit'
-// -- Asynchronous - callback indication required --
-//
-// Returns: OK or ERROR
-//
-// Note: 'archiveIndication' should receive a NULL pointer for the newRecord if
-// no record is available
-// Note: This function will only be invoked by the wview daemon if the
-// 'stationInit' function set the 'stationGeneratesArchives' to TRUE
-//
-int stationGetArchive (WVIEWD_WORK *work)
-{
- // just indicate a NULL record, WMR918 does not generate them (and this
- // function should never be called!)
- (*ArchiveIndicator) (NULL);
- return OK;
-}
-
-// station-supplied function to indicate data is available on the station
-// interface medium (serial or ethernet) -
-// It is the responsibility of the station interface to read the data from the
-// medium and process appropriately. The data does not have to be read within
-// the context of this function, but may be used to stimulate a state machine.
-// -- Synchronous --
-//
-// Returns: N/A
-//
-void stationDataIndicate (WVIEWD_WORK *work)
-{
- wmr918ReadData (work);
- return;
-}
-
-// station-supplied function to indicate the interface timer has expired -
-// It is the responsibility of the station interface to start/stop the interface
-// timer as needed for the particular station requirements.
-// The station interface timer is specified by the 'ifTimer' member of the
-// WVIEWD_WORK structure. No other timers in that structure should be manipulated
-// in any way by the station interface code.
-// -- Synchronous --
-//
-// Returns: N/A
-//
-void stationIFTimerExpiry (WVIEWD_WORK *work)
-{
- return;
-}
-
-////////////****//// S T A T I O N A P I E N D ////****////////////
-
-
-// ... ----- static (local) methods ----- ...
-
-static void serialPortConfig (int fd)
-{
- struct termios port;
- int portstatus;
-
- // We want full control of what is set and simply reset the entire port struct
- memset (&port, 0, sizeof(port));
-
- // Serial control options:
- port.c_cflag &= ~PARENB; // No parity
- port.c_cflag &= ~CSTOPB; // One stop bit
- port.c_cflag &= ~CSIZE; // Character size mask
- port.c_cflag |= CS8; // Character size 8 bits
- port.c_cflag |= CREAD; // Enable Receiver
- port.c_cflag &= ~HUPCL; // No "hangup"
- port.c_cflag &= ~CRTSCTS; // No flowcontrol
- port.c_cflag |= CLOCAL; // Ignore modem control lines
-
- // Baudrate, for newer systems
- cfsetispeed (&port, B9600);
- cfsetospeed (&port, B9600);
-
- // Serial local options:
- // Raw input = clear ICANON, ECHO, ECHOE, and ISIG
- // Disable misc other local features = clear FLUSHO, NOFLSH, TOSTOP, PENDIN, and IEXTEN
- // So we actually clear all flags in port.c_lflag
- port.c_lflag = 0;
-
- // Serial input options:
- // Disable parity check = clear INPCK, PARMRK, and ISTRIP
- // Disable software flow control = clear IXON, IXOFF, and IXANY
- // Disable any translation of CR and LF = clear INLCR, IGNCR, and ICRNL
- // Ignore break condition on input = set IGNBRK
- // Ignore parity errors just in case = set IGNPAR;
- // So we can clear all flags except IGNBRK and IGNPAR
- port.c_iflag = IGNBRK|IGNPAR;
-
- // Serial output options:
- port.c_oflag = 0;
-
- port.c_cc[VTIME] = 10; // timer 1s
- port.c_cc[VMIN] = 0; // blocking read until 1 char
-
- tcsetattr (fd, TCSANOW, &port);
- tcflush (fd, TCIOFLUSH);
-
- return;
-}
-
+/*---------------------------------------------------------------------------
+ 
+ FILENAME:
+ ws2300Interface.c
+ 
+ PURPOSE:
+ Provide the Oregon Scientific WMR918 station interface API and utilities.
+ 
+ REVISION HISTORY:
+ Date Engineer Revision Remarks
+ 04/09/2008 M.S. Teel 0 Original
+ 
+ NOTES:
+ 
+ 
+ LICENSE:
+ Copyright (c) 2008, Mark S. Teel (mark@teel.ws)
+ 
+ This source code is released for free distribution under the terms 
+ of the GNU General Public License.
+ 
+----------------------------------------------------------------------------*/
+
+/* ... System include files
+*/
+
+/* ... Library include files
+*/
+
+/* ... Local include files
+*/
+#include <wmr918Interface.h>
+
+/* ... global memory declarations
+*/
+
+/* ... local memory
+*/
+
+#if HOST_IS_BIGENDIAN
+#define SHORT_SWAP(x) (((x << 8) & 0xFF00) | ((x >> 8) & 0x00FF))
+#else
+#define SHORT_SWAP(x) (x)
+#endif
+
+static WMR918_IF_DATA wmr918WorkData;
+static void (*ArchiveIndicator) (ARCHIVE_PKT* newRecord);
+
+static void serialPortConfig (int fd);
+
+
+
+////////////****////**** S T A T I O N A P I ****////****////////////
+///// Must be provided by each supported wview station interface //////
+
+// station-supplied init function
+// -- Can Be Asynchronous - event indication required --
+//
+// MUST:
+// - set the 'stationGeneratesArchives' flag in WVIEWD_WORK:
+// if the station generates archive records (TRUE) or they should be
+// generated automatically by the daemon from the sensor readings (FALSE)
+// - Initialize the 'stationData' store for station work area
+// - Initialize the interface medium
+// - do initial LOOP acquisition
+// - do any catch-up on archive records if there is a data logger
+// - 'work->runningFlag' can be used for start up synchronization but should
+// not be modified by the station interface code
+// - indicate init is done by sending the STATION_INIT_COMPLETE_EVENT event to
+// this process (radProcessEventsSend (NULL, STATION_INIT_COMPLETE_EVENT, 0))
+//
+// OPTIONAL:
+// - Initialize a state machine or any other construct required for the
+// station interface - these should be stored in the 'stationData' store
+//
+// 'archiveIndication' - indication callback used to pass back an archive record
+// generated as a result of 'stationGetArchive' being called; should receive a
+// NULL pointer for 'newRecord' if no record available; only used if
+// 'stationGeneratesArchives' flag is set to TRUE by the station interface
+//
+// Returns: OK or ERROR
+//
+int stationInit
+(
+ WVIEWD_WORK *work,
+ void (*archiveIndication)(ARCHIVE_PKT* newRecord)
+)
+{
+ int i;
+ STIM stim;
+
+ memset (&wmr918WorkData, 0, sizeof(wmr918WorkData));
+
+ // save the archive indication callback (we should never need it)
+ ArchiveIndicator = archiveIndication;
+
+ // set our work data pointer
+ work->stationData = &wmr918WorkData;
+
+ // set the Archive Generation flag to indicate the WMR918 DOES NOT
+ // generate them
+ work->stationGeneratesArchives = FALSE;
+
+ // initialize the medium abstraction based on user configuration
+ if (!strcmp (work->stationInterface, "serial"))
+ {
+ if (serialMediumInit (&work->medium, serialPortConfig, O_RDONLY | O_NOCTTY | O_NDELAY) == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: serial MediumInit failed");
+ return ERROR;
+ }
+ }
+ else if (!strcmp (work->stationInterface, "ethernet"))
+ {
+ if (ethernetMediumInit (&work->medium, work->stationHost, work->stationPort)
+ == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: ethernet MediumInit failed");
+ return ERROR;
+ }
+ }
+ else
+ {
+ radMsgLog (PRI_HIGH, "stationInit: medium %s not supported",
+ work->stationInterface);
+ return ERROR;
+ }
+
+ // initialize the interface using the media specific routine
+ if ((*(work->medium.init)) (&work->medium, work->stationDevice) == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: medium setup failed");
+ return ERROR;
+ }
+
+ if (!strcmp (work->stationInterface, "serial"))
+ {
+ radMsgLog (PRI_STATUS, "WMR918 on %s opened ...",
+ work->stationDevice);
+ }
+ else if (!strcmp (work->stationInterface, "ethernet"))
+ {
+ radMsgLog (PRI_STATUS, "WMR918 on %s:%d opened ...",
+ work->stationHost, work->stationPort);
+ }
+
+ // grab the station configuration now
+ if (stationGetConfigValueInt (work,
+ STATION_PARM_ELEVATION,
+ &wmr918WorkData.elevation)
+ == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt ELEV failed!");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+ if (stationGetConfigValueFloat (work,
+ STATION_PARM_LATITUDE,
+ &wmr918WorkData.latitude)
+ == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt LAT failed!");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+ if (stationGetConfigValueFloat (work,
+ STATION_PARM_LONGITUDE,
+ &wmr918WorkData.longitude)
+ == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt LONG failed!");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+ if (stationGetConfigValueInt (work,
+ STATION_PARM_ARC_INTERVAL,
+ &wmr918WorkData.archiveInterval)
+ == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt ARCINT failed!");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+ if (stationGetConfigValueInt (work,
+ STATION_PARM_OUTSIDE_CHANNEL,
+ &wmr918WorkData.outsideChannel)
+ == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: stationGetConfigValueInt outside channel failed!");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+
+ // set the work archive interval now
+ work->archiveInterval = wmr918WorkData.archiveInterval;
+
+ // sanity check the archive interval against the most recent record
+ if (stationVerifyArchiveInterval (work) == ERROR)
+ {
+ // bad magic!
+ radMsgLog (PRI_HIGH, "stationInit: stationVerifyArchiveInterval failed!");
+ radMsgLog (PRI_HIGH, "You must either move old /var/run/wview/archive files out of the way -or-");
+ radMsgLog (PRI_HIGH, "fix the wview.conf setting...");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+ else
+ {
+ radMsgLog (PRI_STATUS, "station archive interval: %d minutes",
+ work->archiveInterval);
+ }
+
+ if (wmr918Init (work) == ERROR)
+ {
+ radMsgLog (PRI_HIGH, "stationInit: wmr918Init failed!");
+ (*(work->medium.exit)) (&work->medium);
+ return ERROR;
+ }
+
+ return OK;
+}
+
+// station-supplied exit function
+//
+// Returns: N/A
+//
+void stationExit (WVIEWD_WORK *work)
+{
+ wmr918Exit (work);
+ (*(work->medium.exit)) (&work->medium);
+
+ return;
+}
+
+// station-supplied function to retrieve positional info (lat, long, elev) -
+// should populate 'work' fields: latitude, longitude, elevation
+// -- Synchronous --
+//
+// - If station does not store these parameters, they can be retrieved from the
+// wview.conf file (see daemon.c for example conf file use) - user must choose
+// station type "Generic" when running the wviewconfig script
+//
+// Returns: OK or ERROR
+//
+int stationGetPosition (WVIEWD_WORK *work)
+{
+ // just set the values from our internal store - we retrieved them in
+ // stationInit
+ work->elevation = (short)wmr918WorkData.elevation;
+ if (wmr918WorkData.latitude >= 0)
+ work->latitude = (short)((wmr918WorkData.latitude*10)+0.5);
+ else
+ work->latitude = (short)((wmr918WorkData.latitude*10)-0.5);
+ if (wmr918WorkData.longitude >= 0)
+ work->longitude = (short)((wmr918WorkData.longitude*10)+0.5);
+ else
+ work->longitude = (short)((wmr918WorkData.longitude*10)-0.5);
+
+ radMsgLog (PRI_STATUS, "station location: elevation: %d feet",
+ work->elevation);
+
+ radMsgLog (PRI_STATUS, "station location: latitude: %3.1f %c longitude: %3.1f %c",
+ (float)abs(work->latitude)/10.0,
+ ((work->latitude < 0) ? 'S' : 'N'),
+ (float)abs(work->longitude)/10.0,
+ ((work->longitude < 0) ? 'W' : 'E'));
+
+ return OK;
+}
+
+// station-supplied function to indicate a time sync should be performed if the
+// station maintains time, otherwise may be safely ignored
+// -- Can Be Asynchronous --
+//
+// Returns: OK or ERROR
+//
+int stationSyncTime (WVIEWD_WORK *work)
+{
+ // We don't use the WMR918 time...
+ return OK;
+}
+
+// station-supplied function to indicate sensor readings should be performed -
+// should populate 'work' struct: loopPkt (see datadefs.h for minimum field reqs)
+// -- Can Be Asynchronous --
+//
+// - indicate readings are complete by sending the STATION_LOOP_COMPLETE_EVENT
+// event to this process (radProcessEventsSend (NULL, STATION_LOOP_COMPLETE_EVENT, 0))
+//
+// Returns: OK or ERROR
+//
+int stationGetReadings (WVIEWD_WORK *work)
+{
+ wmr918GetReadings (work);
+
+ return OK;
+}
+
+// station-supplied function to indicate an archive record should be generated -
+// MUST populate an ARCHIVE_RECORD struct and indicate it to 'archiveIndication'
+// function passed into 'stationInit'
+// -- Asynchronous - callback indication required --
+//
+// Returns: OK or ERROR
+//
+// Note: 'archiveIndication' should receive a NULL pointer for the newRecord if
+// no record is available
+// Note: This function will only be invoked by the wview daemon if the
+// 'stationInit' function set the 'stationGeneratesArchives' to TRUE
+//
+int stationGetArchive (WVIEWD_WORK *work)
+{
+ // just indicate a NULL record, WMR918 does not generate them (and this
+ // function should never be called!)
+ (*ArchiveIndicator) (NULL);
+ return OK;
+}
+
+// station-supplied function to indicate data is available on the station
+// interface medium (serial or ethernet) -
+// It is the responsibility of the station interface to read the data from the
+// medium and process appropriately. The data does not have to be read within
+// the context of this function, but may be used to stimulate a state machine.
+// -- Synchronous --
+//
+// Returns: N/A
+//
+void stationDataIndicate (WVIEWD_WORK *work)
+{
+ wmr918ReadData (work);
+ return;
+}
+
+// station-supplied function to indicate the interface timer has expired -
+// It is the responsibility of the station interface to start/stop the interface
+// timer as needed for the particular station requirements.
+// The station interface timer is specified by the 'ifTimer' member of the
+// WVIEWD_WORK structure. No other timers in that structure should be manipulated
+// in any way by the station interface code.
+// -- Synchronous --
+//
+// Returns: N/A
+//
+void stationIFTimerExpiry (WVIEWD_WORK *work)
+{
+ return;
+}
+
+////////////****//// S T A T I O N A P I E N D ////****////////////
+
+
+// ... ----- static (local) methods ----- ...
+
+static void serialPortConfig (int fd)
+{
+ struct termios port;
+ int portstatus;
+
+ // We want full control of what is set and simply reset the entire port struct
+ memset (&port, 0, sizeof(port));
+
+ // Serial control options:
+ port.c_cflag &= ~PARENB; // No parity
+ port.c_cflag &= ~CSTOPB; // One stop bit
+ port.c_cflag &= ~CSIZE; // Character size mask
+ port.c_cflag |= CS8; // Character size 8 bits
+ port.c_cflag |= CREAD; // Enable Receiver
+ port.c_cflag &= ~HUPCL; // No "hangup"
+ port.c_cflag &= ~CRTSCTS; // No flowcontrol
+ port.c_cflag |= CLOCAL; // Ignore modem control lines
+
+ // Baudrate, for newer systems
+ cfsetispeed (&port, B9600);
+ cfsetospeed (&port, B9600);
+
+ // Serial local options:
+ // Raw input = clear ICANON, ECHO, ECHOE, and ISIG
+ // Disable misc other local features = clear FLUSHO, NOFLSH, TOSTOP, PENDIN, and IEXTEN
+ // So we actually clear all flags in port.c_lflag
+ port.c_lflag = 0;
+
+ // Serial input options:
+ // Disable parity check = clear INPCK, PARMRK, and ISTRIP
+ // Disable software flow control = clear IXON, IXOFF, and IXANY
+ // Disable any translation of CR and LF = clear INLCR, IGNCR, and ICRNL
+ // Ignore break condition on input = set IGNBRK
+ // Ignore parity errors just in case = set IGNPAR;
+ // So we can clear all flags except IGNBRK and IGNPAR
+ port.c_iflag = IGNBRK|IGNPAR;
+
+ // Serial output options:
+ port.c_oflag = 0;
+
+ port.c_cc[VTIME] = 10; // timer 1s
+ port.c_cc[VMIN] = 0; // blocking read until 1 char
+
+ tcsetattr (fd, TCSANOW, &port);
+ tcflush (fd, TCIOFLUSH);
+
+ return;
+}
+
diff -urN wview-5.5.0/stations/WS-2300/Makefile.am wview-5.5.0-patch/stations/WS-2300/Makefile.am
--- wview-5.5.0/stations/WS-2300/Makefile.am	2009-04-20 02:04:29.000000000 +0300
+++ wview-5.5.0-patch/stations/WS-2300/Makefile.am	2009-06-03 12:24:18.000000000 +0300
@@ -10,8 +10,8 @@
 		-I$(prefix)/include \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
 		-D_GNU_SOURCE \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_WVIEWD
 
 # define the sources
@@ -52,8 +52,8 @@
 		$(top_srcdir)/stations/WS-2300/ws2300protocol.h
 
 # define libraries
-wviewd_ws2300_LDADD = -lc -lm -lrad -lsqlite3
+wviewd_ws2300_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-wviewd_ws2300_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wviewd_ws2300_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/stations/WS-2300/ws2300protocol.c wview-5.5.0-patch/stations/WS-2300/ws2300protocol.c
--- wview-5.5.0/stations/WS-2300/ws2300protocol.c	2009-04-26 18:22:59.000000000 +0300
+++ wview-5.5.0-patch/stations/WS-2300/ws2300protocol.c	2009-06-03 12:24:41.000000000 +0300
@@ -425,7 +425,7 @@
 {
 // bad magic!
 radMsgLog (PRI_HIGH, "stationInit: stationVerifyArchiveInterval failed!");
- radMsgLog (PRI_HIGH, "You must either move old /var/wview/archive files out of the way -or-");
+ radMsgLog (PRI_HIGH, "You must either move old /var/run/wview/archive files out of the way -or-");
 radMsgLog (PRI_HIGH, "fix the wview.conf setting...");
 (*(work->medium.exit)) (&work->medium);
 return WS_STATE_ERROR;
diff -urN wview-5.5.0/stations/WXT510/Makefile.am wview-5.5.0-patch/stations/WXT510/Makefile.am
--- wview-5.5.0/stations/WXT510/Makefile.am	2009-04-20 02:04:46.000000000 +0300
+++ wview-5.5.0-patch/stations/WXT510/Makefile.am	2009-06-03 12:25:00.000000000 +0300
@@ -13,8 +13,8 @@
 		-I$(prefix)/include \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
 		-D_GNU_SOURCE \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_WVIEWD
 
 # define the sources
@@ -55,8 +55,8 @@
 		$(top_srcdir)/stations/WXT510/nmea0183.h
 
 # define libraries
-wviewd_wxt510_LDADD = -lc -lm -lrad -lsqlite3
+wviewd_wxt510_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-wviewd_wxt510_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wviewd_wxt510_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/stations/WXT510/wxt510config/Makefile.am wview-5.5.0-patch/stations/WXT510/wxt510config/Makefile.am
--- wview-5.5.0/stations/WXT510/wxt510config/Makefile.am	2009-04-20 02:05:02.000000000 +0300
+++ wview-5.5.0-patch/stations/WXT510/wxt510config/Makefile.am	2009-06-03 11:23:48.000000000 +0300
@@ -31,8 +31,8 @@
 		$(top_srcdir)/stations/WXT510/wxt510config/wxt510config.c
 
 # define libraries
-wxt510config_LDADD = -lc -lm -lrad -lsqlite3
+wxt510config_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-wxt510config_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wxt510config_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/stations/WXT510/wxt510Interface.c wview-5.5.0-patch/stations/WXT510/wxt510Interface.c
--- wview-5.5.0/stations/WXT510/wxt510Interface.c	2009-04-26 18:22:59.000000000 +0300
+++ wview-5.5.0-patch/stations/WXT510/wxt510Interface.c	2009-06-03 12:25:18.000000000 +0300
@@ -192,7 +192,7 @@
 {
 // bad magic!
 radMsgLog (PRI_HIGH, "stationInit: stationVerifyArchiveInterval failed!");
- radMsgLog (PRI_HIGH, "You must either move old /var/wview/archive files out of the way -or-");
+ radMsgLog (PRI_HIGH, "You must either move old /var/run/wview/archive files out of the way -or-");
 radMsgLog (PRI_HIGH, "fix the wview.conf setting...");
 (*(work->medium.exit)) (&work->medium);
 return ERROR;
diff -urN wview-5.5.0/utilities/archive-be2le/Makefile.am wview-5.5.0-patch/utilities/archive-be2le/Makefile.am
--- wview-5.5.0/utilities/archive-be2le/Makefile.am	2009-04-20 02:05:26.000000000 +0300
+++ wview-5.5.0-patch/utilities/archive-be2le/Makefile.am	2009-06-03 11:50:16.000000000 +0300
@@ -10,8 +10,8 @@
 		-I$(top_srcdir)/utilities \
 		-I$(prefix)/include \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_UTILITIES \
 		-D_GNU_SOURCE
 
@@ -29,8 +29,8 @@
 		$(top_srcdir)/utilities/archive-be2le/arc_be2le.c
 
 # define libraries
-arc_be2le_LDADD = -lc -lm -lrad -lsqlite3
+arc_be2le_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-arc_be2le_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+arc_be2le_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/utilities/archive-le2be/Makefile.am wview-5.5.0-patch/utilities/archive-le2be/Makefile.am
--- wview-5.5.0/utilities/archive-le2be/Makefile.am	2009-04-20 02:05:38.000000000 +0300
+++ wview-5.5.0-patch/utilities/archive-le2be/Makefile.am	2009-06-03 11:50:38.000000000 +0300
@@ -10,8 +10,8 @@
 		-I$(top_srcdir)/utilities \
 		-I$(prefix)/include \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_UTILITIES \
 		-D_GNU_SOURCE
 
@@ -29,8 +29,8 @@
 		$(top_srcdir)/utilities/archive-le2be/arc_le2be.c
 
 # define libraries
-arc_le2be_LDADD = -lc -lm -lrad -lsqlite3
+arc_le2be_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-arc_le2be_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+arc_le2be_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/utilities/hilowcreate/Makefile.am wview-5.5.0-patch/utilities/hilowcreate/Makefile.am
--- wview-5.5.0/utilities/hilowcreate/Makefile.am	2009-04-20 02:05:52.000000000 +0300
+++ wview-5.5.0-patch/utilities/hilowcreate/Makefile.am	2009-06-03 11:51:05.000000000 +0300
@@ -8,8 +8,8 @@
 		-I$(top_srcdir)/common \
 		-I$(prefix)/include \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_UTILITIES=1 \
 		-D_GNU_SOURCE
 
@@ -26,8 +26,8 @@
 		$(top_srcdir)/utilities/hilowcreate/hilowcreate.c
 
 # define libraries
-hilowcreate_LDADD = -lc -lm -lrad -lsqlite3
+hilowcreate_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-hilowcreate_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+hilowcreate_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/utilities/sqlite2wlk/Makefile.am wview-5.5.0-patch/utilities/sqlite2wlk/Makefile.am
--- wview-5.5.0/utilities/sqlite2wlk/Makefile.am	2009-04-20 02:06:06.000000000 +0300
+++ wview-5.5.0-patch/utilities/sqlite2wlk/Makefile.am	2009-06-03 11:49:50.000000000 +0300
@@ -10,8 +10,8 @@
 		-I$(top_srcdir)/utilities \
 		-I$(prefix)/include \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_UTILITIES \
 		-D_GNU_SOURCE
 
@@ -27,8 +27,8 @@
 		$(top_srcdir)/utilities/sqlite2wlk/sqlite2wlk.c
 
 # define libraries
-sqlite2wlk_LDADD = -lc -lm -lrad -lsqlite3
+sqlite2wlk_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-sqlite2wlk_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+sqlite2wlk_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/utilities/wlk2sqlite/Makefile.am wview-5.5.0-patch/utilities/wlk2sqlite/Makefile.am
--- wview-5.5.0/utilities/wlk2sqlite/Makefile.am	2009-04-20 02:06:21.000000000 +0300
+++ wview-5.5.0-patch/utilities/wlk2sqlite/Makefile.am	2009-06-03 11:51:29.000000000 +0300
@@ -10,8 +10,8 @@
 		-I$(top_srcdir)/utilities \
 		-I$(prefix)/include \
 		-DHOST_IS_BIGENDIAN=@HOST_IS_BIGENDIAN@ \
-		-DWV_CONFIG_DIR=\"$(prefix)/etc/wview\" \
-		-DWV_RUN_DIR=\"$(prefix)/var/wview\" \
+		-DWV_CONFIG_DIR=\"/etc/wview\" \
+		-DWV_RUN_DIR=\"/var/run/wview\" \
 		-DBUILD_UTILITIES \
 		-D_GNU_SOURCE
 
@@ -27,8 +27,8 @@
 		$(top_srcdir)/utilities/wlk2sqlite/wlk2sqlite.c
 
 # define libraries
-wlk2sqlite_LDADD = -lc -lm -lrad -lsqlite3
+wlk2sqlite_LDADD = -lc -lm -lrad -lsqlite3 -lmysqlclient
 
 # define library directories
-wlk2sqlite_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
+wlk2sqlite_LDFLAGS = -L@libdir@ -L/usr/local/lib -L$(prefix)/lib
 
diff -urN wview-5.5.0/utilities/wlk2sqlite/wlk2sqlite.c wview-5.5.0-patch/utilities/wlk2sqlite/wlk2sqlite.c
--- wview-5.5.0/utilities/wlk2sqlite/wlk2sqlite.c	2009-03-19 14:07:22.000000000 +0200
+++ wview-5.5.0-patch/utilities/wlk2sqlite/wlk2sqlite.c	2009-06-03 11:52:08.000000000 +0300
@@ -1,335 +1,335 @@
-/*---------------------------------------------------------------------
- 
- FILE NAME:
- wlk2sqlite.c
- 
- PURPOSE:
- wview archive file convertor utility: Davis WLK TO SQLite3 database.
- 
- REVISION HISTORY:
- Date Programmer Revision Function
- 09/13/2008 M.S. Teel 0 Original
- 
- ASSUMPTIONS:
- None.
- 
-------------------------------------------------------------------------*/
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/select.h>
-
-#include <sysdefs.h>
-#include <datadefs.h>
-#include <dbfiles.h>
-#include "wvutilities.h"
-
-
-static void USAGE (void)
-{
- printf ("Usage: wlk2sqlite <source_directory> [destination_directory]\n\n");
- printf (" Convert WLK archive file data in <source_directory> to SQLite3 format in [destination_directory]/wview-archive.sdb\n");
- printf (" or to $prefix/var/wview/archive/wview-archive.sdb if [destination_directory] is not given\n");
- printf ("Note: Must be run as root if [destination_directory] is not given. Only unique records will be inserted.\n");
- printf ("Note: <source_directory> can be the same as [destination_directory]\n\n");
- return;
-}
-
-static void convertWLKToArchivePkt(ArchiveRecord* newRecord, ARCHIVE_PKT* archivePkt, time_t timeStamp)
-{
- Data_Indices index;
- float click;
-
- // create the time_t time for the record:
- archivePkt->dateTime = timeStamp;
-
- archivePkt->usUnits = 1;
- archivePkt->interval = newRecord->archiveInterval;
-
- // Set all values to NULL by default:
- for (index = DATA_INDEX_barometer; index < DATA_INDEX_MAX; index ++)
- {
- archivePkt->value[index] = ARCHIVE_VALUE_NULL;
- }
-
- // Set the values we can:
- archivePkt->value[DATA_INDEX_outTemp] = (float)newRecord->outsideTemp/10.0;
- archivePkt->value[DATA_INDEX_barometer] = (float)newRecord->barometer/1000.0;
- archivePkt->value[DATA_INDEX_inTemp] = (float)newRecord->insideTemp/10.0;
- archivePkt->value[DATA_INDEX_inHumidity] = (float)newRecord->insideHum/10.0;
- archivePkt->value[DATA_INDEX_outHumidity] = (float)newRecord->outsideHum/10.0;
- archivePkt->value[DATA_INDEX_windSpeed] = (float)newRecord->windSpeed/10.0;
- if (newRecord->windDirection < 16)
- {
- archivePkt->value[DATA_INDEX_windDir] = (float)newRecord->windDirection * 22.5;
- }
- archivePkt->value[DATA_INDEX_windGust] = (float)newRecord->hiWindSpeed/10.0;
- if (newRecord->hiWindDirection < 16)
- {
- archivePkt->value[DATA_INDEX_windGustDir] = (float)newRecord->hiWindDirection * 22.5;
- }
-
- if ((newRecord->rain & 0xF000) == 0x0000)
- click = 10;
- else if ((newRecord->rain & 0xF000) == 0x2000) //0.2 mm 0x2000
- click = 127;
- else if ((newRecord->rain & 0xF000) == 0x3000) //1.0 mm 0x3000
- click = 25.4;
- else if ((newRecord->rain & 0xF000) == 0x6000) //0.1 mm 0x6000 (not fully supported)
- click = 254;
- else
- click = 100;
-
- archivePkt->value[DATA_INDEX_rainRate] 
- = (float)newRecord->hiRainRate/click;
- archivePkt->value[DATA_INDEX_rain] 
- = ((float)(newRecord->rain & 0xFFF))/click;
- archivePkt->value[DATA_INDEX_dewpoint] 
- = wvutilsCalculateDewpoint ((float)archivePkt->value[DATA_INDEX_outTemp],
- (float)archivePkt->value[DATA_INDEX_outHumidity]);
- archivePkt->value[DATA_INDEX_windchill] 
- = wvutilsCalculateWindChill ((float)archivePkt->value[DATA_INDEX_outTemp],
- (float)archivePkt->value[DATA_INDEX_windSpeed]);
- archivePkt->value[DATA_INDEX_heatindex] 
- = wvutilsCalculateHeatIndex ((float)archivePkt->value[DATA_INDEX_outTemp],
- (float)archivePkt->value[DATA_INDEX_outHumidity]);
- archivePkt->value[DATA_INDEX_ET] = (float)newRecord->ET/1000.0;
- if ((USHORT)newRecord->solarRad != 0x7FFF && 
- (USHORT)newRecord->solarRad != 0xFFFF && 
- (float)newRecord->solarRad >= 0 && 
- (float)newRecord->solarRad <= 1800)
- {
- archivePkt->value[DATA_INDEX_radiation] = (float)newRecord->solarRad;
- }
- if (newRecord->UV != 0xFF)
- {
- archivePkt->value[DATA_INDEX_UV] = (float)newRecord->UV/10.0;
- }
- if (newRecord->extraTemp[0] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_extraTemp1] = (float)(newRecord->extraTemp[0] - 90);
- }
- if (newRecord->extraTemp[1] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_extraTemp2] = (float)(newRecord->extraTemp[1] - 90);
- }
- if (newRecord->extraTemp[2] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_extraTemp3] = (float)(newRecord->extraTemp[2] - 90);
- }
- if (newRecord->soilTemp[0] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_soilTemp1] = (float)(newRecord->soilTemp[0] - 90);
- }
- if (newRecord->soilTemp[1] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_soilTemp2] = (float)(newRecord->soilTemp[1] - 90);
- }
- if (newRecord->soilTemp[2] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_soilTemp3] = (float)(newRecord->soilTemp[2] - 90);
- }
- if (newRecord->soilTemp[3] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_soilTemp4] = (float)(newRecord->soilTemp[3] - 90);
- }
- if (newRecord->leafTemp[0] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_leafTemp1] = (float)(newRecord->leafTemp[0] - 90);
- }
- if (newRecord->leafTemp[1] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_leafTemp2] = (float)(newRecord->leafTemp[1] - 90);
- }
- if (newRecord->extraHum[0] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_extraHumid1] = (float)newRecord->extraHum[0];
- }
- if (newRecord->extraHum[1] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_extraHumid2] = (float)newRecord->extraHum[1];
- }
- if (newRecord->soilMoisture[0] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_soilMoist1] = (float)newRecord->soilMoisture[0];
- }
- if (newRecord->soilMoisture[1] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_soilMoist2] = (float)newRecord->soilMoisture[1];
- }
- if (newRecord->soilMoisture[2] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_soilMoist3] = (float)newRecord->soilMoisture[2];
- }
- if (newRecord->soilMoisture[3] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_soilMoist4] = (float)newRecord->soilMoisture[3];
- }
- if (newRecord->leafWetness[0] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_leafWet1] = (float)newRecord->leafWetness[0];
- }
- if (newRecord->leafWetness[1] != 0xFF)
- {
- archivePkt->value[DATA_INDEX_leafWet2] = (float)newRecord->leafWetness[1];
- }
-
- return;
-}
-
-static void ConvertWlkToSqlite (char *srcDir, char *destDir)
-{
- time_t timeStamp, diffTime, startTime = time(NULL);
- struct tm buildTime;
- USHORT recdate, rectime;
- ArchiveRecord wlkPkt;
- ARCHIVE_PKT sqlitePkt;
- int dups = 0, inserts = 0, errors = 0, lastminute = 0;
-
- if (destDir != NULL)
- {
- dbsqliteArchiveSetPath(destDir);
- }
-
- // ... Initialize the archive database interface:
- if (dbsqliteArchiveInit() == ERROR)
- {
- printf("dbsqliteArchiveInit failed\n");
- return;
- }
- 
- // Avoid expensive fsyncs during conversion
- if (dbsqliteArchivePragmaSet("synchronous", "off") == ERROR)
- {
- printf("dbsqliteArchivePragmaSet synchronous = off failed\n");
- return;
- }
-
- // Avoid expensive journal operations during conversion
- if (dbsqliteArchivePragmaSet("journal_mode", "off") == ERROR)
- {
- printf("dbsqliteArchivePragmaSet journal_mode = off failed\n");
- return;
- }
-
- // Set the start date to 1/1/2000:
- recdate = INSERT_PACKED_DATE(2000,1,1);
- rectime = 0;
- while (dbfGetNextArchiveRecord(srcDir, &recdate, &rectime, &wlkPkt) != ERROR)
- {
- // Build the sqlite timestamp:
- memset (&buildTime, 0, sizeof(buildTime));
- buildTime.tm_min = EXTRACT_PACKED_MINUTE(rectime);
- buildTime.tm_hour = EXTRACT_PACKED_HOUR(rectime);
- buildTime.tm_mday = EXTRACT_PACKED_DAY(recdate);
- buildTime.tm_mon = EXTRACT_PACKED_MONTH(recdate) - 1;
- buildTime.tm_year = EXTRACT_PACKED_YEAR(recdate) - 1900;
- buildTime.tm_isdst = -1;
- timeStamp = mktime(&buildTime);
-
- // Check to see if this record exists in the sqlite DB:
- if (dbsqliteArchiveGetRecord(timeStamp, &sqlitePkt) != ERROR)
- {
- // duplicate, skip it:
- dups ++;
- continue;
- }
-
- // OK, need to insert this puppy:
- convertWLKToArchivePkt(&wlkPkt, &sqlitePkt, timeStamp);
-
- if (dbsqliteArchiveStoreRecord(&sqlitePkt) == ERROR)
- {
- // Error:
- errors ++;
- }
- else
- {
- // Good stuff:
- inserts ++;
- }
-
- diffTime = time(NULL) - startTime;
-
- // Output running stats
- if ( (int)diffTime%60 == 0 && (int)diffTime/60 > 0 && (int)diffTime/60 != lastminute )
- {
- printf("Conversion Stats:\n");
- printf(" Time : %d:%d minutes\n", (int)diffTime/60, (int)diffTime%60);
- printf(" Recs/sec : %d\n", (inserts+dups+errors)/(int)diffTime);
- printf(" Inserts : %d\n", inserts);
- printf(" Duplicates: %d\n", dups);
- printf(" Errors : %d\n", errors);
- lastminute = (int)diffTime/60;
- }
- }
-
- dbsqliteArchiveExit();
-
- diffTime = time(NULL) - startTime;
-
- // Output results:
- printf("Conversion Stats:\n");
- printf(" Time : %d:%d\n", (int)diffTime/60, (int)diffTime%60);
- printf(" Recs/sec : %d\n", (inserts+dups+errors)/(int)diffTime);
- printf(" Inserts : %d\n", inserts);
- printf(" Duplicates: %d\n", dups);
- printf(" Errors : %d\n", errors);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int argc, char *argv[])
-{
- char *SourceDir, *DestDir;
- struct stat fileData;
- 
- if (argc < 2)
- {
- USAGE ();
- exit (-1);
- }
- if (argc < 3)
- {
- printf("Using default $prefix/var/wview/archive destination...\n");
- DestDir = NULL;
- }
- else
- {
- DestDir = argv[2];
- }
-
- SourceDir = argv[1];
-
- // sanity check the arguments
- if (stat(SourceDir, &fileData) != 0)
- {
- printf ("Source directory %s does not exist!\n", SourceDir);
- exit (-1);
- }
- else if (!(fileData.st_mode & S_IFDIR))
- {
- printf ("Source directory %s is not a directory!\n", SourceDir);
- exit (-1);
- }
- if (DestDir)
- {
- if (stat(DestDir, &fileData) != 0)
- {
- printf ("Destination directory %s does not exist!\n", DestDir);
- exit (-1);
- }
- else if (!(fileData.st_mode & S_IFDIR))
- {
- printf ("Destination directory %s is not a directory!\n", DestDir);
- exit (-1);
- }
- }
-
- // OK, args appear to be good, convert WLK files to our SQLite DB:
- printf("Converting...(this takes a while, longer on small devices)...\n");
- ConvertWlkToSqlite (SourceDir, DestDir);
- exit (0);
-}
-
+/*---------------------------------------------------------------------
+ 
+ FILE NAME:
+ wlk2sqlite.c
+ 
+ PURPOSE:
+ wview archive file convertor utility: Davis WLK TO SQLite3 database.
+ 
+ REVISION HISTORY:
+ Date Programmer Revision Function
+ 09/13/2008 M.S. Teel 0 Original
+ 
+ ASSUMPTIONS:
+ None.
+ 
+------------------------------------------------------------------------*/
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/select.h>
+
+#include <sysdefs.h>
+#include <datadefs.h>
+#include <dbfiles.h>
+#include "wvutilities.h"
+
+
+static void USAGE (void)
+{
+ printf ("Usage: wlk2sqlite <source_directory> [destination_directory]\n\n");
+ printf (" Convert WLK archive file data in <source_directory> to SQLite3 format in [destination_directory]/wview-archive.sdb\n");
+ printf (" or to /var/run/wview/archive/wview-archive.sdb if [destination_directory] is not given\n");
+ printf ("Note: Must be run as root if [destination_directory] is not given. Only unique records will be inserted.\n");
+ printf ("Note: <source_directory> can be the same as [destination_directory]\n\n");
+ return;
+}
+
+static void convertWLKToArchivePkt(ArchiveRecord* newRecord, ARCHIVE_PKT* archivePkt, time_t timeStamp)
+{
+ Data_Indices index;
+ float click;
+
+ // create the time_t time for the record:
+ archivePkt->dateTime = timeStamp;
+
+ archivePkt->usUnits = 1;
+ archivePkt->interval = newRecord->archiveInterval;
+
+ // Set all values to NULL by default:
+ for (index = DATA_INDEX_barometer; index < DATA_INDEX_MAX; index ++)
+ {
+ archivePkt->value[index] = ARCHIVE_VALUE_NULL;
+ }
+
+ // Set the values we can:
+ archivePkt->value[DATA_INDEX_outTemp] = (float)newRecord->outsideTemp/10.0;
+ archivePkt->value[DATA_INDEX_barometer] = (float)newRecord->barometer/1000.0;
+ archivePkt->value[DATA_INDEX_inTemp] = (float)newRecord->insideTemp/10.0;
+ archivePkt->value[DATA_INDEX_inHumidity] = (float)newRecord->insideHum/10.0;
+ archivePkt->value[DATA_INDEX_outHumidity] = (float)newRecord->outsideHum/10.0;
+ archivePkt->value[DATA_INDEX_windSpeed] = (float)newRecord->windSpeed/10.0;
+ if (newRecord->windDirection < 16)
+ {
+ archivePkt->value[DATA_INDEX_windDir] = (float)newRecord->windDirection * 22.5;
+ }
+ archivePkt->value[DATA_INDEX_windGust] = (float)newRecord->hiWindSpeed/10.0;
+ if (newRecord->hiWindDirection < 16)
+ {
+ archivePkt->value[DATA_INDEX_windGustDir] = (float)newRecord->hiWindDirection * 22.5;
+ }
+
+ if ((newRecord->rain & 0xF000) == 0x0000)
+ click = 10;
+ else if ((newRecord->rain & 0xF000) == 0x2000) //0.2 mm 0x2000
+ click = 127;
+ else if ((newRecord->rain & 0xF000) == 0x3000) //1.0 mm 0x3000
+ click = 25.4;
+ else if ((newRecord->rain & 0xF000) == 0x6000) //0.1 mm 0x6000 (not fully supported)
+ click = 254;
+ else
+ click = 100;
+
+ archivePkt->value[DATA_INDEX_rainRate] 
+ = (float)newRecord->hiRainRate/click;
+ archivePkt->value[DATA_INDEX_rain] 
+ = ((float)(newRecord->rain & 0xFFF))/click;
+ archivePkt->value[DATA_INDEX_dewpoint] 
+ = wvutilsCalculateDewpoint ((float)archivePkt->value[DATA_INDEX_outTemp],
+ (float)archivePkt->value[DATA_INDEX_outHumidity]);
+ archivePkt->value[DATA_INDEX_windchill] 
+ = wvutilsCalculateWindChill ((float)archivePkt->value[DATA_INDEX_outTemp],
+ (float)archivePkt->value[DATA_INDEX_windSpeed]);
+ archivePkt->value[DATA_INDEX_heatindex] 
+ = wvutilsCalculateHeatIndex ((float)archivePkt->value[DATA_INDEX_outTemp],
+ (float)archivePkt->value[DATA_INDEX_outHumidity]);
+ archivePkt->value[DATA_INDEX_ET] = (float)newRecord->ET/1000.0;
+ if ((USHORT)newRecord->solarRad != 0x7FFF && 
+ (USHORT)newRecord->solarRad != 0xFFFF && 
+ (float)newRecord->solarRad >= 0 && 
+ (float)newRecord->solarRad <= 1800)
+ {
+ archivePkt->value[DATA_INDEX_radiation] = (float)newRecord->solarRad;
+ }
+ if (newRecord->UV != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_UV] = (float)newRecord->UV/10.0;
+ }
+ if (newRecord->extraTemp[0] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_extraTemp1] = (float)(newRecord->extraTemp[0] - 90);
+ }
+ if (newRecord->extraTemp[1] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_extraTemp2] = (float)(newRecord->extraTemp[1] - 90);
+ }
+ if (newRecord->extraTemp[2] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_extraTemp3] = (float)(newRecord->extraTemp[2] - 90);
+ }
+ if (newRecord->soilTemp[0] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_soilTemp1] = (float)(newRecord->soilTemp[0] - 90);
+ }
+ if (newRecord->soilTemp[1] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_soilTemp2] = (float)(newRecord->soilTemp[1] - 90);
+ }
+ if (newRecord->soilTemp[2] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_soilTemp3] = (float)(newRecord->soilTemp[2] - 90);
+ }
+ if (newRecord->soilTemp[3] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_soilTemp4] = (float)(newRecord->soilTemp[3] - 90);
+ }
+ if (newRecord->leafTemp[0] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_leafTemp1] = (float)(newRecord->leafTemp[0] - 90);
+ }
+ if (newRecord->leafTemp[1] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_leafTemp2] = (float)(newRecord->leafTemp[1] - 90);
+ }
+ if (newRecord->extraHum[0] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_extraHumid1] = (float)newRecord->extraHum[0];
+ }
+ if (newRecord->extraHum[1] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_extraHumid2] = (float)newRecord->extraHum[1];
+ }
+ if (newRecord->soilMoisture[0] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_soilMoist1] = (float)newRecord->soilMoisture[0];
+ }
+ if (newRecord->soilMoisture[1] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_soilMoist2] = (float)newRecord->soilMoisture[1];
+ }
+ if (newRecord->soilMoisture[2] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_soilMoist3] = (float)newRecord->soilMoisture[2];
+ }
+ if (newRecord->soilMoisture[3] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_soilMoist4] = (float)newRecord->soilMoisture[3];
+ }
+ if (newRecord->leafWetness[0] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_leafWet1] = (float)newRecord->leafWetness[0];
+ }
+ if (newRecord->leafWetness[1] != 0xFF)
+ {
+ archivePkt->value[DATA_INDEX_leafWet2] = (float)newRecord->leafWetness[1];
+ }
+
+ return;
+}
+
+static void ConvertWlkToSqlite (char *srcDir, char *destDir)
+{
+ time_t timeStamp, diffTime, startTime = time(NULL);
+ struct tm buildTime;
+ USHORT recdate, rectime;
+ ArchiveRecord wlkPkt;
+ ARCHIVE_PKT sqlitePkt;
+ int dups = 0, inserts = 0, errors = 0, lastminute = 0;
+
+ if (destDir != NULL)
+ {
+ dbsqliteArchiveSetPath(destDir);
+ }
+
+ // ... Initialize the archive database interface:
+ if (dbsqliteArchiveInit() == ERROR)
+ {
+ printf("dbsqliteArchiveInit failed\n");
+ return;
+ }
+ 
+ // Avoid expensive fsyncs during conversion
+ if (dbsqliteArchivePragmaSet("synchronous", "off") == ERROR)
+ {
+ printf("dbsqliteArchivePragmaSet synchronous = off failed\n");
+ return;
+ }
+
+ // Avoid expensive journal operations during conversion
+ if (dbsqliteArchivePragmaSet("journal_mode", "off") == ERROR)
+ {
+ printf("dbsqliteArchivePragmaSet journal_mode = off failed\n");
+ return;
+ }
+
+ // Set the start date to 1/1/2000:
+ recdate = INSERT_PACKED_DATE(2000,1,1);
+ rectime = 0;
+ while (dbfGetNextArchiveRecord(srcDir, &recdate, &rectime, &wlkPkt) != ERROR)
+ {
+ // Build the sqlite timestamp:
+ memset (&buildTime, 0, sizeof(buildTime));
+ buildTime.tm_min = EXTRACT_PACKED_MINUTE(rectime);
+ buildTime.tm_hour = EXTRACT_PACKED_HOUR(rectime);
+ buildTime.tm_mday = EXTRACT_PACKED_DAY(recdate);
+ buildTime.tm_mon = EXTRACT_PACKED_MONTH(recdate) - 1;
+ buildTime.tm_year = EXTRACT_PACKED_YEAR(recdate) - 1900;
+ buildTime.tm_isdst = -1;
+ timeStamp = mktime(&buildTime);
+
+ // Check to see if this record exists in the sqlite DB:
+ if (dbsqliteArchiveGetRecord(timeStamp, &sqlitePkt) != ERROR)
+ {
+ // duplicate, skip it:
+ dups ++;
+ continue;
+ }
+
+ // OK, need to insert this puppy:
+ convertWLKToArchivePkt(&wlkPkt, &sqlitePkt, timeStamp);
+
+ if (dbsqliteArchiveStoreRecord(&sqlitePkt) == ERROR)
+ {
+ // Error:
+ errors ++;
+ }
+ else
+ {
+ // Good stuff:
+ inserts ++;
+ }
+
+ diffTime = time(NULL) - startTime;
+
+ // Output running stats
+ if ( (int)diffTime%60 == 0 && (int)diffTime/60 > 0 && (int)diffTime/60 != lastminute )
+ {
+ printf("Conversion Stats:\n");
+ printf(" Time : %d:%d minutes\n", (int)diffTime/60, (int)diffTime%60);
+ printf(" Recs/sec : %d\n", (inserts+dups+errors)/(int)diffTime);
+ printf(" Inserts : %d\n", inserts);
+ printf(" Duplicates: %d\n", dups);
+ printf(" Errors : %d\n", errors);
+ lastminute = (int)diffTime/60;
+ }
+ }
+
+ dbsqliteArchiveExit();
+
+ diffTime = time(NULL) - startTime;
+
+ // Output results:
+ printf("Conversion Stats:\n");
+ printf(" Time : %d:%d\n", (int)diffTime/60, (int)diffTime%60);
+ printf(" Recs/sec : %d\n", (inserts+dups+errors)/(int)diffTime);
+ printf(" Inserts : %d\n", inserts);
+ printf(" Duplicates: %d\n", dups);
+ printf(" Errors : %d\n", errors);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+int main (int argc, char *argv[])
+{
+ char *SourceDir, *DestDir;
+ struct stat fileData;
+ 
+ if (argc < 2)
+ {
+ USAGE ();
+ exit (-1);
+ }
+ if (argc < 3)
+ {
+ printf("Using default /var/run/wview/archive destination...\n");
+ DestDir = NULL;
+ }
+ else
+ {
+ DestDir = argv[2];
+ }
+
+ SourceDir = argv[1];
+
+ // sanity check the arguments
+ if (stat(SourceDir, &fileData) != 0)
+ {
+ printf ("Source directory %s does not exist!\n", SourceDir);
+ exit (-1);
+ }
+ else if (!(fileData.st_mode & S_IFDIR))
+ {
+ printf ("Source directory %s is not a directory!\n", SourceDir);
+ exit (-1);
+ }
+ if (DestDir)
+ {
+ if (stat(DestDir, &fileData) != 0)
+ {
+ printf ("Destination directory %s does not exist!\n", DestDir);
+ exit (-1);
+ }
+ else if (!(fileData.st_mode & S_IFDIR))
+ {
+ printf ("Destination directory %s is not a directory!\n", DestDir);
+ exit (-1);
+ }
+ }
+
+ // OK, args appear to be good, convert WLK files to our SQLite DB:
+ printf("Converting...(this takes a while, longer on small devices)...\n");
+ ConvertWlkToSqlite (SourceDir, DestDir);
+ exit (0);
+}
+
diff -urN wview-5.5.0/wviewconfig/Makefile.am wview-5.5.0-patch/wviewconfig/Makefile.am
--- wview-5.5.0/wviewconfig/Makefile.am	2009-02-05 07:09:28.000000000 +0200
+++ wview-5.5.0-patch/wviewconfig/Makefile.am	2009-06-03 11:40:21.000000000 +0300
@@ -32,8 +32,8 @@
 wviewconfig: $(srcdir)/wviewconfig.sh
 	rm -f wviewconfig
 	echo "#!/bin/sh" > wviewconfig
-	echo "WVIEW_CONF_DIR=$(prefix)/etc/wview" >> wviewconfig
-	echo "WVIEW_DATA_DIR=$(prefix)/var/wview" >> wviewconfig
+	echo "WVIEW_CONF_DIR=/etc/wview" >> wviewconfig
+	echo "WVIEW_DATA_DIR=/var/run/wview" >> wviewconfig
 	echo "STATION_TYPE=$(MY_STATION_TYPE)" >> wviewconfig
 	cat $(srcdir)/wviewconfig.sh >> wviewconfig
 	chmod ugo+x wviewconfig
@@ -41,8 +41,8 @@
 wviewhtmlconfig: $(srcdir)/wviewhtmlconfig.sh
 	rm -f wviewhtmlconfig
 	echo "#!/bin/sh" > wviewhtmlconfig
-	echo "WVIEW_CONF_DIR=$(prefix)/etc/wview" >> wviewhtmlconfig
-	echo "WVIEW_DATA_DIR=$(prefix)/var/wview" >> wviewhtmlconfig
+	echo "WVIEW_CONF_DIR=/etc/wview" >> wviewhtmlconfig
+	echo "WVIEW_DATA_DIR=/var/run/wview" >> wviewhtmlconfig
 	echo "WVIEWCONFIG=$(exec_prefix)/bin/wviewconfig" >> wviewhtmlconfig
 	cat $(srcdir)/wviewhtmlconfig.sh >> wviewhtmlconfig
 	chmod ugo+x wviewhtmlconfig
diff -urN wview-5.5.0/wviewmgmt/ftp.php wview-5.5.0-patch/wviewmgmt/ftp.php
--- wview-5.5.0/wviewmgmt/ftp.php	2009-03-23 00:20:55.000000000 +0200
+++ wview-5.5.0-patch/wviewmgmt/ftp.php	2009-06-03 11:54:17.000000000 +0300
@@ -311,7 +311,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -363,7 +363,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -415,7 +415,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -467,7 +467,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -519,7 +519,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -571,7 +571,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -623,7 +623,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -675,7 +675,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -727,7 +727,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -779,7 +779,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/run/wview/img)
 </a>
 </label>
 </td>
diff -urN wview-5.5.0/wviewmgmt/functions.php.sh wview-5.5.0-patch/wviewmgmt/functions.php.sh
--- wview-5.5.0/wviewmgmt/functions.php.sh	2009-05-09 16:18:29.000000000 +0300
+++ wview-5.5.0-patch/wviewmgmt/functions.php.sh	2009-06-03 11:57:57.000000000 +0300
@@ -1,13 +1,13 @@
 
 function IswviewRunning()
 {
- $pidstr = GetInstallPrefix() . "/var/wview/wviewd.pid";
+ $pidstr = GetInstallPrefix() . "/var/run/wview/wviewd.pid";
 return (file_exists($pidstr));
 }
 
 function IswviewIndicated()
 {
- $pidstr = GetInstallPrefix() . "/var/wview/wview-running";
+ $pidstr = GetInstallPrefix() . "/var/run/wview/wview-running";
 return (file_exists($pidstr));
 }
 
@@ -253,7 +253,7 @@
 {
 $retVal = 0;
 
- $connectStr = GetInstallPrefix() . "/var/wview/archive/wview-archive.sdb";
+ $connectStr = GetInstallPrefix() . "/var/run/wview/archive/wview-archive.sdb";
 try
 {
 $conn = new PDO('sqlite:'.$connectStr);
@@ -283,7 +283,7 @@
 {
 $retVal = 0;
 
- $connectStr = GetInstallPrefix() . "/var/wview/archive/wview-archive.sdb";
+ $connectStr = GetInstallPrefix() . "/var/run/wview/archive/wview-archive.sdb";
 try
 {
 $conn = new PDO('sqlite:'.$connectStr);
@@ -328,7 +328,7 @@
 {
 $retVal = 0;
 
- $connectStr = GetInstallPrefix() . "/var/wview/archive/wview-hilow.sdb";
+ $connectStr = GetInstallPrefix() . "/var/run/wview/archive/wview-hilow.sdb";
 if (file_exists($connectStr))
 {
 try
@@ -362,7 +362,7 @@
 {
 $retVal = 0;
 
- $connectStr = GetInstallPrefix() . "/var/wview/archive/wview-noaa.sdb";
+ $connectStr = GetInstallPrefix() . "/var/run/wview/archive/wview-noaa.sdb";
 if (file_exists($connectStr))
 {
 try
diff -urN wview-5.5.0/wviewmgmt/ssh.php wview-5.5.0-patch/wviewmgmt/ssh.php
--- wview-5.5.0/wviewmgmt/ssh.php	2009-03-23 00:22:06.000000000 +0200
+++ wview-5.5.0-patch/wviewmgmt/ssh.php	2009-06-03 11:53:11.000000000 +0300
@@ -176,7 +176,7 @@
 <td valign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File or Directory:&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Local Source directory (normally $prefix/var/wview/img)
+ Local Source directory (normally /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -273,7 +273,7 @@
 <td valign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File or Directory:&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Local Source directory (normally $prefix/var/wview/img)
+ Local Source directory (normally /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -370,7 +370,7 @@
 <td valign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File or Directory:&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Local Source directory (normally $prefix/var/wview/img)
+ Local Source directory (normally /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -467,7 +467,7 @@
 <td valign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File or Directory:&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Local Source directory (normally $prefix/var/wview/img)
+ Local Source directory (normally /var/run/wview/img)
 </a>
 </label>
 </td>
@@ -564,7 +564,7 @@
 <td valign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File or Directory:&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Local Source directory (normally $prefix/var/wview/img)
+ Local Source directory (normally /var/run/wview/img)
 </a>
 </label>
 </td>
diff -urN wview-5.5.0/wview-User-Manual.html wview-5.5.0-patch/wview-User-Manual.html
--- wview-5.5.0/wview-User-Manual.html	2009-04-19 20:00:26.000000000 +0300
+++ wview-5.5.0-patch/wview-User-Manual.html	2009-06-03 12:28:25.000000000 +0300
@@ -645,10 +645,10 @@
 => Examples:
 
 [(default)]
- > HTTP_DOC_ROOT=/var/www ./configure [station_enable_str]
+ > HTTP_DOC_ROOT=/srv/www ./configure [station_enable_str]
 
 [Wunderground]
- > HTTP_DOC_ROOT=/var/www/weather ./configure [station_enable_str] --enable-http
+ > HTTP_DOC_ROOT=/srv/www/weather ./configure [station_enable_str] --enable-http
 
 
 => Note:
@@ -669,8 +669,8 @@
 make install - makes "default" then installs the binaries to 
 ${exec-prefix}/bin (usually /usr/local/bin)
 make install-env - builds "install" then copies example config files
- and run environment (from .../bin) to $prefix/etc/wview 
- and $prefix/var/wview respectively, preserving existing 
+ and run environment (from .../bin) to /etc/wview 
+ and /var/run/wview respectively, preserving existing 
 data files and backing up existing configuration
 
 4.6 Configure to run at system boot (if new install):
@@ -795,7 +795,7 @@
 6.2.2 wviewconfig 
 The wview SQLite3 configuration database can be updated using the configure 
 script "wviewconfig". This script asks questions interactively then updates 
- (backing up the existing file) the file $prefix/etc/wview/wview-conf.sdb based 
+ (backing up the existing file) the file /etc/wview/wview-conf.sdb based 
 on the answers. It uses your previous settings as the default selections where 
 appropriate. It will also allow interactive enabling/disabling of optional wview 
 capabilities such as alarms or file transfer via ftp or ssh. See the relevant 
@@ -811,7 +811,7 @@
 
 Customizing HTML Templates For Your Site
 
- Note: Changing HTML templates in $prefix/etc/wview/html does not require a restart
+ Note: Changing HTML templates in /etc/wview/html does not require a restart
 of wview. The changes you make will take effect at the next htmlgend
 generation cycle.
 Note: Changing the config files images.conf, images-user.conf, images-metric.conf,
@@ -820,28 +820,28 @@
 to be sent to htmlgend to cause these files to be re-read. Do this as
 follows (this will also toggle log verbosity):
 
- sudo kill -s HUP `cat $prefix/var/wview/htmlgend.pid`
+ sudo kill -s HUP `cat /var/run/wview/htmlgend.pid`
 
 As of version 3.5.0, a new configuration script for template setup has been
 added: wviewhtmlconfig. You should run this first to configure which site
 skin you want to use and to setup the default imperial or metric graphics.
 To run it (as root) enter "wviewhtmlconfig" at the command line, it is interactive
- and will save your old $prefix/etc/wview/html directory to $prefix/etc/wview/html-DATE.TIME.
+ and will save your old /etc/wview/html directory to /etc/wview/html-DATE.TIME.
 As wview users contribute new skins they will be added to the wview distribution
 and supported by the wviewhtmlconfig script.
 
- HTML template files (in $prefix/etc/wview/html) should be customized to your language and 
+ HTML template files (in /etc/wview/html) should be customized to your language and 
 your design preferences. The configuration file html-templates.conf specifies the 
 template files to be used for generation. You may add or remove from this list as 
 needed.
 	 
- Edit copies placed in $prefix/etc/wview/html directory, either by use of the "wviewhtmlconfig" 
+ Edit copies placed in /etc/wview/html directory, either by use of the "wviewhtmlconfig" 
 script or manually copied for upgrades.
 
 The HTML tags "!--stationCity--" and "!--stationState--" should not be removed 
 from template files for which you want the station location included. wview will 
 replace these tags with the values you specify for "STATION_CITY" and "STATION_STATE" 
- in $prefix/etc/wview/wview-conf.sdb.
+ in /etc/wview/wview-conf.sdb.
 
 The default wview "skin" is provided in the distribution at:
 examples/html/classic. For information on creating your own skin, see the file
@@ -849,25 +849,25 @@
 
 The default configuration supports different homepage templates based on day or night. 
 These templates are "index-day.htx" and "index-night.htx" in 
- $prefix/etc/wview/html-templates.conf. If you want one standard homepage template INSTEAD 
+ /etc/wview/html-templates.conf. If you want one standard homepage template INSTEAD 
 of day/night templates, uncomment "index.htx" and comment the day/night templates
- in the $prefix/etc/wview/html-templates.conf file. See the example html-templates.conf file 
+ in the /etc/wview/html-templates.conf file. See the example html-templates.conf file 
 in the distro for more details. You may either create soft links to the day and 
- night templates you want to use in $prefix/etc/wview/html 
+ night templates you want to use in /etc/wview/html 
 (ln -s index-clouds.htx index-day.htx), or copy the files you want to 
 index-day.htx and index-night.htx.
 
 There is now support for XML file generation. XML templates should be named
- "*.xtx" and placed in $prefix/etc/wview/html. An example RSS feed template is 
+ "*.xtx" and placed in /etc/wview/html. An example RSS feed template is 
 included in the distro: examples/html/wxrss.xtx. An href to it is included
 in all home page template examples so the RSS feed may be discovered while 
 visiting your home page. wxrss.xtx should be edited for your site when placed 
- in $prefix/etc/wview/html either manually or via "make install-env".
+ in /etc/wview/html either manually or via "make install-env".
 
 There is now support for "generic" template file types. For any template
 file named "example.[ext]x" and listed in html-templates.conf, wview will 
 generate a file named "example.[ext]". For example, "myscript.phpx" listed
- in html-templates.conf and found in $prefix/var/wview/html will have all wview 
+ in html-templates.conf and found in /var/run/wview/html will have all wview 
 tags replaced and the resulting file will be named "myscript.php". Please 
 note that if you are using FTP to transfer your files you will need to add 
 rules for any new extensions you want to support in the wview-conf.sdb database.
@@ -886,7 +886,7 @@
 There is now support for html template macro file inclusion in html template
 files. The new meta-tag is !--include filename.xxx-- (brackets omitted). Any
 template macro file that is to be included in one or more html templates should
- be listed BEFORE any templates including it in the $prefix/etc/wview/html-templates.conf
+ be listed BEFORE any templates including it in the /etc/wview/html-templates.conf
 configuration file. There is no restriction on the levels of inclusion, just be 
 sure you specify macro templates early in the html-templates.conf file.
 
@@ -928,34 +928,34 @@
 6.5 (Optional) Alarms or Weather Data Feeds
 
 If weather data alarm processing and/or TCP stream socket server for data 
- feeds is desired, edit $prefix/etc/wview/wview-conf.sdb - changing to fit your requirements.
+ feeds is desired, edit /etc/wview/wview-conf.sdb - changing to fit your requirements.
 See <a href="#13. Alarms and wview As a Data Feed Engine">Alarms and wview As a Data Feed Engine</a> for details.
 
 6.6 (Optional) FTP File Transfer
 
 If ftp of files to a remote host is desired, edit the wview configuration database
- $prefix/etc/wview/wview-conf.sdb - changing to fit your environment.
+ /etc/wview/wview-conf.sdb - changing to fit your environment.
 See <a href="#12. Setting Up FTP Transfers">Setting Up FTP Transfers</a> for details.
 
 6.7 (Optional) Secure rsync Remote Synchronization
 
 If secure rsync synchronization of files to a remote host is desired, edit the 
- wview configuration database $prefix/etc/wview/wview-conf.sdb - changing to 
+ wview configuration database /etc/wview/wview-conf.sdb - changing to 
 fit your environment. 
 See <a href="#14. Secure File Transfer (rsync/ssh)">Secure File Transfer (rsync/ssh)</a> for details.
 
 6.8 Date Formats in Images and Generated Files
 
 The format of the date in images and generated files can now be defined in 
- $prefix/etc/wview/wview-conf.sdb.
+ /etc/wview/wview-conf.sdb.
 Prior to version 3.2.2 the date format was fixed depending on whether US or metric units were used.
 Valid formats are those allowed by strftime(3).
 
 6.9 Pre/Post-Generation Scripts
 
- The script file $prefix/etc/wview/pre-generate.sh (if it exists) will 
+ The script file /etc/wview/pre-generate.sh (if it exists) will 
 be executed by the htmlgend daemon immediately before the generation of all images 
- and templates. The script file $prefix/etc/wview/post-generate.sh (if it exists) will 
+ and templates. The script file /etc/wview/post-generate.sh (if it exists) will 
 be executed by the htmlgend daemon immediately following the generation of all images 
 and templates. This can be used to perform custom transformations of generated images 
 or files. It should NOT be used to perform network tasks such as FTP or other tasks
@@ -1083,7 +1083,7 @@
 
 -------- wview-conf.sdb
 
- -- Update $prefix/etc/wview/wview-conf.sdb (see configuration instructions)
+ -- Update /etc/wview/wview-conf.sdb (see configuration instructions)
 -- Modify the following parameter so it is enabled (yes):
 HTMLGEN_EXTENDED_DATA
 
@@ -1097,7 +1097,7 @@
 "################# V P P L U S D A T A B U C K E T S #################"
 Copy all definitions below this heading to your existing images.conf 
 (images-metric.conf) file.
- -- Edit $prefix/etc/wview/images.conf (images-metric.conf if a metric station)
+ -- Edit /etc/wview/images.conf (images-metric.conf if a metric station)
 -- Starting at the VP Plus Data Buckets header, enable all desired sensor
 images by removing all "#" characters from the beginning of the line.
 Remember, if you don't have the physical sensor installed on your 
@@ -1110,7 +1110,7 @@
 
 -------- html-templates.conf
 
- -- Edit $prefix/etc/wview/html-templates.conf
+ -- Edit /etc/wview/html-templates.conf
 -- Replace the corresponding old references with:
 
 almanac_Plus.htx
@@ -1125,7 +1125,7 @@
 -------- index.htx
 
 -- Copy the Plus index.htx template over the standard file:
- cp $prefix/etc/wview/html/index_Plus.htx $prefix/etc/wview/html/index.htx
+ cp /etc/wview/html/index_Plus.htx /etc/wview/html/index.htx
 
 -- Edit the index.htx file as usual to customize for your station,
 language and content preferences.
@@ -1134,8 +1134,8 @@
 
 -- If upgrading, copy the example Current_Plus.htx file from
 the distribution to your wview config tree:
- cp wview-x.y.z/examples/html/Current_Plus.htx $prefix/etc/wview/html
- -- Edit $prefix/etc/wview/html/Current_Plus.htx as usual to customize 
+ cp wview-x.y.z/examples/html/Current_Plus.htx /etc/wview/html
+ -- Edit /etc/wview/html/Current_Plus.htx as usual to customize 
 for your station, language and content preferences.
 -- Save and Exit the editor
 
@@ -1143,8 +1143,8 @@
 
 -- If upgrading, copy the example Daily_Plus.htx file from
 the distribution to your wview config tree:
- cp wview-x.y.z/examples/html/Daily_Plus.htx $prefix/etc/wview/html
- -- Edit $prefix/etc/wview/html/Daily_Plus.htx
+ cp wview-x.y.z/examples/html/Daily_Plus.htx /etc/wview/html
+ -- Edit /etc/wview/html/Daily_Plus.htx
 -- Delete all extended data image references that are NOT supported by
 your station. Find the comment lines:
 !-- ***** Extended Data Begin ***** --
@@ -1155,7 +1155,7 @@
 and delete all non-supported sensor images. The extended sensor images
 remaining should match the "Day" images you enabled in images.conf 
 (images-metric.conf).
- -- Edit $prefix/etc/wview/html/Daily_Plus.htx as usual to customize 
+ -- Edit /etc/wview/html/Daily_Plus.htx as usual to customize 
 for your station, language and content preferences.
 -- Save and Exit the editor
 
@@ -1163,8 +1163,8 @@
 
 -- If upgrading, copy the example Monthly_Plus.htx file from
 the distribution to your wview config tree:
- cp wview-x.y.z/examples/html/Monthly_Plus.htx $prefix/etc/wview/html
- -- Edit $prefix/etc/wview/html/Monthly_Plus.htx
+ cp wview-x.y.z/examples/html/Monthly_Plus.htx /etc/wview/html
+ -- Edit /etc/wview/html/Monthly_Plus.htx
 -- Delete all extended data image references that are NOT supported by
 your station. Find the comment lines:
 !-- ***** Extended Data Begin ***** --
@@ -1175,7 +1175,7 @@
 and delete all non-supported sensor images. The extended sensor images
 remaining should match the "Month" images you enabled in images.conf 
 (images-metric.conf).
- -- Edit $prefix/etc/wview/html/Monthly_Plus.htx as usual to customize 
+ -- Edit /etc/wview/html/Monthly_Plus.htx as usual to customize 
 for your station, language and content preferences.
 -- Save and Exit the editor
 
@@ -1183,8 +1183,8 @@
 
 -- If upgrading, copy the example Yearly_Plus.htx file from
 the distribution to your wview config tree:
- cp wview-x.y.z/examples/html/Yearly_Plus.htx $prefix/etc/wview/html
- -- Edit $prefix/etc/wview/html/Yearly_Plus.htx
+ cp wview-x.y.z/examples/html/Yearly_Plus.htx /etc/wview/html
+ -- Edit /etc/wview/html/Yearly_Plus.htx
 -- Delete all extended data image references that are NOT supported by
 your station. Find the comment lines:
 !-- ***** Extended Data Begin ***** --
@@ -1195,7 +1195,7 @@
 and delete all non-supported sensor images. The extended sensor images
 remaining should match the "Year" images you enabled in images.conf 
 (images-metric.conf).
- -- Edit $prefix/etc/wview/html/Yearly_Plus.htx as usual to customize 
+ -- Edit /etc/wview/html/Yearly_Plus.htx as usual to customize 
 for your station, language and content preferences.
 -- Save and Exit the editor
 </pre> 
@@ -1316,7 +1316,7 @@
 <hr size=2 noshade>
 <h2>9. Run Environment Description</h2>
 <pre>
-$prefix/etc/wview - configuration files
+/etc/wview - configuration files
 
 *.conf - configuration files described below
 html/*.htx - HTML template files to be customized for your 
@@ -1326,7 +1326,7 @@
 These tags are replaced each time htmlgend 
 generates new image and html files.
 
-$prefix/var/wview - run time data files
+/var/run/wview - run time data files
 
 *.pid - run time pid files created/deleted by the wview
 daemons. Do NOT alter or delete these files. They 
@@ -1347,7 +1347,7 @@
 <h2>10. Configuration Files Description</h2>
 <pre>
 Note: Most wview configuration is now stored in an SQLite3 database at:
- $prefix/etc/wview/wview-conf.sdb. Thus SQLite3 must be installed and radlib
+ /etc/wview/wview-conf.sdb. Thus SQLite3 must be installed and radlib
 must be configured with "--enable-sqlite".
 Note: There are now several ways to configure wview through the SQLite3 database:
 wviewconfig (command line interface), Web Server ($HTTP_DOC_ROOT/wviewmgmt/login.php),
@@ -1527,9 +1527,9 @@
 > wview-mysql-export debug
 
 11.3.2 Examine the CSV export files:
- > cat $prefix/etc/wview/export/archive.csv
- > cat $prefix/etc/wview/export/outTemp.csv
- > cat $prefix/etc/wview/export/noaaHistory.csv
+ > cat /etc/wview/export/archive.csv
+ > cat /etc/wview/export/outTemp.csv
+ > cat /etc/wview/export/noaaHistory.csv
 
 These will probably be large given this was the first export. They should
 contain all records up to the present time.
@@ -1547,7 +1547,7 @@
 (There should be one record for each day of archive data)
 
 11.3.4 Examine the Import Logs:
- > cat $prefix/etc/wview/export/mysql_import.log
+ > cat /etc/wview/export/mysql_import.log
 
 11.4 Production Setup
 
@@ -1564,7 +1564,7 @@
 Note: You must include a full path for the wview-mysql-export script in the
 cron table.
 
-11.4.2 Done - you can check the $prefix/etc/wview/export directory and the MySQL
+11.4.2 Done - you can check the /etc/wview/export directory and the MySQL
 database to confirm the updates.
 
 11.5 Notes
@@ -1573,12 +1573,12 @@
 existing records with the same dateTime stamp. This is so we get the latest
 HILOW records for the current hour and so if better/more complete data is
 re-exported, it will take precedence over older data. You will notice in the
- debug log file $prefix/etc/wview/export/mysql_import.log that records are 
+ debug log file /etc/wview/export/mysql_import.log that records are 
 deleted and inserted at incremental updates. This is the HILOW last record
 phenomenon.
 
 If you need to cause a complete re-export of all data, delete the file
- $prefix/etc/wview/export/mysql_export_marker. The next time the wview-mysql-export
+ /etc/wview/export/mysql_export_marker. The next time the wview-mysql-export
 script runs, all data will be exported (and replace existing data in the MySQL 
 database).
 
@@ -1698,12 +1698,12 @@
 values for your remote ftp host account. Do not add or remove spaces in this
 command!
 
- cd $prefix/var/wview/img
+ cd /var/run/wview/img
 /usr/bin/ftp -iV -u ftp://remote_username:remote_password@remote_host/[conf_directory] *.*
 
 12.4 Configure wviewftpd
 
- Edit $prefix/etc/wview/wview-conf.sdb as described earlier.
+ Edit /etc/wview/wview-conf.sdb as described earlier.
 
 12.5 Start wview
 [your_distro_start_script_location]/wview start
@@ -1777,36 +1777,36 @@
 
 13.2 Configuration
 
-13.2.1 $prefix/etc/wview/wview-conf.sdb
+13.2.1 /etc/wview/wview-conf.sdb
 
-13.2.1.1 Edit $prefix/etc/wview/wview-conf.sdb
+13.2.1.1 Edit /etc/wview/wview-conf.sdb
 13.2.1.2 Configure the PUSH_INTERVAL parameter to your requirements. This
 value is given in seconds, so 60 seconds would be specified
 by a value of 60. This determines how often wvalarmd will receive
 current conditions data.
 13.2.1.3 Save and Exit the editor
 
-13.2.2 $prefix/etc/wview/wview-conf.sdb
+13.2.2 /etc/wview/wview-conf.sdb
 
-13.2.2.1 Edit $prefix/etc/wview/wview-conf.sdb
+13.2.2.1 Edit /etc/wview/wview-conf.sdb
 13.2.2.2 Choose your station units type by indicating "STATION_US" or
 "STATION_METRIC" in wview-conf.sdb.
 13.2.2.3 List your alarm definitions for up to 10 distinct alarm definitions.
 13.2.2.4 Save and Exit the editor
 
-13.2.3 Scripts: $prefix/etc/wview/alarms/*.sh
+13.2.3 Scripts: /etc/wview/alarms/*.sh
 
 13.2.3.1 If using notification scripts, they should be placed in 
- $prefix/etc/wview/alarms and will receive the arguments described above
+ /etc/wview/alarms and will receive the arguments described above
 when invoked.
 13.2.3.2 There are a few example scripts in the distribution directory
 .../wview-x.y.z/examples/alarms - these will be copied to 
- $prefix/etc/wview/alarms for new installs which build with the "install-env"
+ /etc/wview/alarms for new installs which build with the "install-env"
 target or can be copied there when upgrading an existing installation.
 13.2.3.3 If using custom binaries, make note of the arguments passed to the
 binary above.
 13.2.3.4 The example scripts log alarm events to a log file: 
- $prefix/var/wview/alarms/alarm.log. This may be a feature you want to keep -
+ /var/run/wview/alarms/alarm.log. This may be a feature you want to keep -
 even if you are doing other things in your alarm notification 
 scripts.
 
@@ -1868,9 +1868,9 @@
 make install-env
 
 Upgrades: 
- mkdir $prefix/etc/wview/alarms
- mkdir $prefix/var/wview/alarms
- cp wview-x.y.z/examples/alarms/* $prefix/etc/wview/alarms
+ mkdir /etc/wview/alarms
+ mkdir /var/run/wview/alarms
+ cp wview-x.y.z/examples/alarms/* /etc/wview/alarms
 
 13.4.5 Edit the Thresholds - update wview-conf.sdb for thresholds very near 
 (or already "past") your current outside temperature
@@ -1881,7 +1881,7 @@
 [RH/Fedora] /etc/rc.d/init.d/wview start
 
 13.4.7 Watch the magic:
- tail -f $prefix/var/wview/alarms/alarm.log
+ tail -f /var/run/wview/alarms/alarm.log
 
 13.5 Socket-Based Data Feeds
 
@@ -1970,7 +1970,7 @@
 A new wview daemon has been added to support secure file transfers to 
 remote servers: wviewsshd. It is enabled or disabled in the same way that
 the wviewftpd and wvalarmd daemons are - by editing the SQLite3 database file
- $prefix/etc/wview/wview-conf.sdb. All three of these utility daemons are disabled
+ /etc/wview/wview-conf.sdb. All three of these utility daemons are disabled
 in the standard distribution. The secure updates are performed using rsync over 
 an ssh session. To work properly, the wview server must be able to login and/or 
 execute commands on the destination server via ssh WITHOUT entering a password. 
@@ -2102,10 +2102,10 @@
 
 14.4 Confirming rsync Functionality
 
-14.4.1 Place files in $prefix/var/wview/img (if it is not already your "HTMLGEN_IMAGE_PATH"
+14.4.1 Place files in /var/run/wview/img (if it is not already your "HTMLGEN_IMAGE_PATH"
 in wview-conf.sdb):
 
- root@[wview_server]:# cp [some_test_files] $prefix/var/wview/img
+ root@[wview_server]:# cp [some_test_files] /var/run/wview/img
 
 14.4.2 Create/Verify the destination path on the remote server 
 (as [ssh_login_user]):
@@ -2129,9 +2129,9 @@
 [ssh_login_user]@[remote_host]:# exit
 
 14.4.3 Test rsync over ssh from the wview server:
- root@[wview_server]:# rsync -aqz --rsh=ssh $prefix/var/wview/img/ [remote_host]:[remote_test_dir]
+ root@[wview_server]:# rsync -aqz --rsh=ssh /var/run/wview/img/ [remote_host]:[remote_test_dir]
 
- This should transfer the files you placed in $prefix/var/wview/img to the 
+ This should transfer the files you placed in /var/run/wview/img to the 
 remote server in the [remote_test_dir] directory without a password
 being required.
 
@@ -2149,7 +2149,7 @@
 [SuSE] /etc/init.d/wview stop -OR-
 [RH/Fedora] /etc/rc.d/init.d/wview stop
 
-14.5.2 Update $prefix/etc/wview/wview-conf.sdb adding up to 5 rsync rules.
+14.5.2 Update /etc/wview/wview-conf.sdb adding up to 5 rsync rules.
 
 Each [remote_host] entry must have a corresponding "Host" entry in
 /root/.ssh/config which specifies the login account ([ssh_login_user]) 
@@ -2177,7 +2177,7 @@
 On the other hand, once you get everything set up the way you want, you 
 can disable informational logs if you are concerned about how quickly your 
 /var/log/messages file is rolling over (you are rotating your log files, 
- right?). Set STATION_VERBOSE_MSGS=0 in $prefix/etc/wview/wview-conf.sdb to disable 
+ right?). Set STATION_VERBOSE_MSGS=0 in /etc/wview/wview-conf.sdb to disable 
 informational log entries. You can always re-enable it if you need the 
 verbosity.
 
@@ -2262,7 +2262,7 @@
 (using vpinstall). This will skew your rain season totals or 
 render your archived data unusable. If you do change the archive 
 interval after records have been stored by wview, you will need 
- to delete all archive data in $prefix/var/wview/archive/wview-archive.sdb
+ to delete all archive data in /var/run/wview/archive/wview-archive.sdb
 before restarting wview.
 
 Note 2: You MUST stop wview before using vpconfig to view or change 
@@ -2663,16 +2663,16 @@
 18.2 Configure wview to Generate the AWEKAS File
 
 Copy the appropriate template file (this assumes you have the latest distro HTML
- templates installed in $prefix/etc/wview/html):
+ templates installed in /etc/wview/html):
 
 If you have a metric setup do the following:
- cp $prefix/etc/wview/html/awekas_wl.htx-metric $prefix/etc/wview/html/awekas_wl.htx
+ cp /etc/wview/html/awekas_wl.htx-metric /etc/wview/html/awekas_wl.htx
 
 Else if you have a US (Imperial) setup do the following:
- cp $prefix/etc/wview/html/awekas_wl.htx-us $prefix/etc/wview/html/awekas_wl.htx
+ cp /etc/wview/html/awekas_wl.htx-us /etc/wview/html/awekas_wl.htx
 
- Add (or uncomment if already there) this template in $prefix/etc/wview/html-templates.conf:
- vi $prefix/etc/wview/html-templates.conf
+ Add (or uncomment if already there) this template in /etc/wview/html-templates.conf:
+ vi /etc/wview/html-templates.conf
 
 [Add the following lines or just remove the '#' from awekas_wl.htx if already there]
 [snip]
@@ -2809,7 +2809,7 @@
 This will install radlib, gd, libpng, libjpeg, libz, libcurl and a few 
 other necessities. It will install an appropriate wview start/stop script 
 in /etc/init.d and configure it to run at boot. It will install default 
- config files in $prefix/etc/wview and a default run environment in $prefix/var/wview. 
+ config files in /etc/wview and a default run environment in /var/run/wview. 
 Note that wview binaries are installed in /usr/bin on the slug.
 
 Install the ntpdate crontab:
@@ -2848,8 +2848,8 @@
 
 If upgrading a previous version of wview:
 # /etc/init.d/wview stop
- # mv $prefix/etc/wview $prefix/etc/wview-OLD
- # mv $prefix/var/wview/img $prefix/var/wview/img-OLD
+ # mv /etc/wview /etc/wview-OLD
+ # mv /var/run/wview/img /var/run/wview/img-OLD
 # cd /etc/ipkg
 # wget http://www.wviewweather.com/ipkg/wview.conf
 # ipkg update
@@ -3096,10 +3096,10 @@
 
 With the release of wview version 5.0.0 archive data is no longer stored in
 the Weatherlink WLK file format. wview now stores archive data in an SQLite3
- database, namely $prefix/var/wview/archive/wview-archive.sdb. This will allow
+ database, namely /var/run/wview/archive/wview-archive.sdb. This will allow
 much easier data viewing, modifying and post-processing. Version 5.1.0 added
- a new HILOW data store in the database $prefix/var/wview/archive/wview-hilow.sdb.
- Version 5.2.0 added NOAA data to the database $prefix/var/wview/archive/wview-noaa.sdb.
+ a new HILOW data store in the database /var/run/wview/archive/wview-hilow.sdb.
+ Version 5.2.0 added NOAA data to the database /var/run/wview/archive/wview-noaa.sdb.
 This section will describe each of these databases including when and from what
 data they are created/updated.
 
@@ -3143,11 +3143,11 @@
 
 source_directory is a required argument but can be the same as [destination_directory] -
 I typically use the default archive file location for my install, 
- $prefix/var/wview/archive, since there is nothing destructive about the 
+ /var/run/wview/archive, since there is nothing destructive about the 
 conversion with respect to the old WLK files, it only reads them.
 
 So an example using the default prefix /usr/local would be:
- > sudo wlk2sqlite /usr/local/var/wview/archive
+ > sudo wlk2sqlite /var/run/wview/archive
 This places the newly populated SQLite3 archive database file in the proper
 location for wview 5.0.0 + operation.
 
@@ -3159,7 +3159,7 @@
 22.4.2 Viewing/Modifying Your Data With the sqlite3 CLI Utility
 
 Let's look at your data.
- > sudo sqlite3 /usr/local/var/wview/archive/wview-archive.sdb
+ > sudo sqlite3 /var/run/wview/archive/wview-archive.sdb
 
 sqlite> .help
 (This displays available commands; non-SQL commands begin with '.')
@@ -3186,7 +3186,7 @@
 This is where having our data in an SQL database starts to pay off.
 
 Dump the archive table in SQL format:
- > sudo sqlite3 /usr/local/var/wview/archive/wview-archive.sdb .dump > ~/temp/[my_sql_filename]
+ > sudo sqlite3 /var/run/wview/archive/wview-archive.sdb .dump > ~/temp/[my_sql_filename]
 
 Copy [my_sql_filename] to the target platform.
 
@@ -3206,16 +3206,16 @@
 
 22.5.1 Overview
 
- The database $prefix/var/wview/archive/wview-hilow.sdb will be created and 
+ The database /var/run/wview/archive/wview-hilow.sdb will be created and 
 back-filled with archive records for all records in the archive database. 
 This initialization process can take some time (8-12 minutes per year) but 
 is only required during the first run of wview after an upgrade >= 5.1.0.
- Once $prefix/var/wview/archive/wview-hilow.sdb has been created and back-filled,
+ Once /var/run/wview/archive/wview-hilow.sdb has been created and back-filled,
 wview will add each LOOP sample to the HILOW database.
 
 22.5.2 Structure
 
- The $prefix/var/wview/archive/wview-hilow.sdb database has one table for each
+ The /var/run/wview/archive/wview-hilow.sdb database has one table for each
 of the supported sensor types (i.e., inTemp, outTemp, ... rain, rainRate).
 Each table contains a record for each hour. The data starts with your earliest 
 archive record.
@@ -3248,7 +3248,7 @@
 
 To regenerate the HILOW database:
 > /etc/init.d/wview stop
- > sudo rm $prefix/var/wview/archive/wview-hilow.sdb
+ > sudo rm /var/run/wview/archive/wview-hilow.sdb
 > /etc/init.d/wview start
 
 Note: Doing this will delete the LOOP sample resolution stored while wview is
@@ -3286,7 +3286,7 @@
 
 To regenerate the NOAA database:
 > /etc/init.d/wview stop
- > sudo rm $prefix/var/wview/archive/wview-noaa.sdb
+ > sudo rm /var/run/wview/archive/wview-noaa.sdb
 > /etc/init.d/wview start
 
 22.7 SQLite3 Tips
@@ -3380,8 +3380,8 @@
 need it):
 
 root@localhost:/root# ps aux | grep wv
- root 73863 0.0 0.2 2320 1808 ?? Ss 7:08AM 0:00.02 /usr/local/bin/radmrouted 1 $prefix/var/wview
- root 73865 0.0 0.2 2300 1780 ?? I 7:08AM 0:00.00 /usr/local/bin/radmrouted 1 $prefix/var/wview
+ root 73863 0.0 0.2 2320 1808 ?? Ss 7:08AM 0:00.02 /usr/local/bin/radmrouted 1 /var/run/wview
+ root 73865 0.0 0.2 2300 1780 ?? I 7:08AM 0:00.00 /usr/local/bin/radmrouted 1 /var/run/wview
 root 73868 0.0 0.1 2380 1472 ?? Ss 7:08AM 0:00.36 /usr/local/bin/wviewd
 root 73870 0.0 0.1 2356 1196 ?? I 7:08AM 0:00.00 /usr/local/bin/wviewd
 root 73873 0.0 0.1 2376 1524 ?? Is 7:08AM 0:35.43 /usr/local/bin/wviewsqld
@@ -3457,8 +3457,8 @@
 typically run "tail -f /var/log/messages" in a separate console when 
 starting up wview. You should also when you first install it. Informational 
 logs can later be disabled by editing wview-conf.sdb then sending a HUP signal
- to wviewd and htmlgend: (kill -s HUP `cat $prefix/var/wview/wviewd.pid`) and 
- (kill -s HUP `cat $prefix/var/wview/htmlgend.pid`) respectively.
+ to wviewd and htmlgend: (kill -s HUP `cat /var/run/wview/wviewd.pid`) and 
+ (kill -s HUP `cat /var/run/wview/htmlgend.pid`) respectively.
 
 If you have errors in your startup log, you will need to stop all wview 
 daemons using the wview start script (/etc/init.d/wview stop). These are 
@@ -3469,7 +3469,7 @@
 you know what a good start looks like:
 
 Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524756> : radlib: radmrouted started as a daemon ...
-Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524764> : started on radlib system 1, workdir /usr/local/var/wview
+Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524764> : started on radlib system 1, workdir /var/run/wview
 Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524764> : running... 
 Apr 18 08:48:45 linuxquad wviewd[11680]: <1240062525759> : radlib: wviewd started as a daemon ... 
 Apr 18 08:48:45 linuxquad wviewd[11680]: <1240062525759> : wview 5.4.0 starting ... 
@@ -3498,7 +3498,7 @@
 Apr 18 08:48:46 linuxquad wviewd[11680]: <1240062526055> : newest archive record: 2009-04-14 22:40 
 Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526745> : radlib: htmlgend started as a daemon ... 
 Apr 18 08:48:46 linuxquad wvalarmd[11691]: <1240062526746> : radlib: wvalarmd started as a daemon ... 
-Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : generating to /usr/local/var/wview/img 
+Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : generating to /var/run/wview/img 
 Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : templates at /usr/local/etc/wview/html 
 Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526747> : !! Dual units will be displayed !! 
 Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526747> : Tag Search red-black tree: max black node tree height: 7 
@@ -3515,13 +3515,13 @@
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: htmlgend: 0 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: htmlgend process monitoring is disabled 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wvalarmd: 120 
-Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wvalarmd.pid not present, disable monitoring... 
+Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/run/wview/wvalarmd.pid not present, disable monitoring... 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wvcwopd: 120 
-Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wvcwopd.pid not present, disable monitoring... 
+Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/run/wview/wvcwopd.pid not present, disable monitoring... 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wvhttpd: 120 
-Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wvhttpd.pid not present, disable monitoring... 
+Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/run/wview/wvhttpd.pid not present, disable monitoring... 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wviewsqld: 600 
-Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wviewsqld.pid not present, disable monitoring... 
+Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/run/wview/wviewsqld.pid not present, disable monitoring... 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : running... 
 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527294> : running... 
 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527294> : received station info from wviewd: 20090414 22:40:00 
@@ -3596,13 +3596,13 @@
 image/html configuration for htmlgend). Below are the suitable shell commands
 for each daemon:
 
- kill -s HUP `cat $prefix/var/wview/wviewd.pid`
- kill -s HUP `cat $prefix/var/wview/htmlgend.pid`
- kill -s HUP `cat $prefix/var/wview/wviewftpd.pid`
- kill -s HUP `cat $prefix/var/wview/wviewsshd.pid`
- kill -s HUP `cat $prefix/var/wview/wvalarmd.pid`
- kill -s HUP `cat $prefix/var/wview/wvcwopd.pid`
- kill -s HUP `cat $prefix/var/wview/wvhttpd.pid`
+ kill -s HUP `cat /var/run/wview/wviewd.pid`
+ kill -s HUP `cat /var/run/wview/htmlgend.pid`
+ kill -s HUP `cat /var/run/wview/wviewftpd.pid`
+ kill -s HUP `cat /var/run/wview/wviewsshd.pid`
+ kill -s HUP `cat /var/run/wview/wvalarmd.pid`
+ kill -s HUP `cat /var/run/wview/wvcwopd.pid`
+ kill -s HUP `cat /var/run/wview/wvhttpd.pid`
 
 
 24.5 Vantage Pro
@@ -3685,7 +3685,7 @@
 It can be used to display semaphore usage, buffer usage and radmrouted 
 statisitics:
 
- # raddebug 1 $prefix/var/wview
+ # raddebug 1 /var/run/wview
 
 It will output something like:

Places

File wview-mammut_tuning_for_suse-5.5.0.diff of Package wview (Revision 4342c19f066a809dc109c12175d27aac)

Places