diff --git a/bin/user/wxobs.py b/bin/user/wxobs.py index 43657d7..21d3710 100644 --- a/bin/user/wxobs.py +++ b/bin/user/wxobs.py @@ -23,7 +23,7 @@ from weeutil.weeutil import to_bool from weewx.cheetahgenerator import SearchList -wxobs_version = "0.6.2" +wxobs_version = "0.6.3" def logmsg(level, msg): syslog.syslog(level, '%s' % msg) @@ -231,7 +231,7 @@ def __init__(self, generator): send_include = True #This is the default, set to False if you don't want to send the include file repeatedly to the server. Use with caution (ie: remember this setting when things stop working, it might be the cure) - rsync_options: Not documented in the skin.confDefault is '-ac'. Use with, + rsync_options: Not documented in the skin.conf Default is '-ac'. Use with, caution and no spaces allowed. dest_directory: An option to allow transfer of BOTH include and database files to the same directory as specified with this. If using multiple @@ -459,14 +459,16 @@ def __init__(self, generator): # database transfer db_loc_file = "%s" % (self.sqlite_db) db_ssh_str = "%s@%s:%s/" % (self.rsync_user, self.rsync_server, - rsync_options, self.sq_root) - Rsync(self.rsync_user, self.rsync_server, db_loc_file, db_ssh_str, - self.sq_root, self.wxobs_debug, self.log_success) + self.sq_root) + Rsync(self.rsync_user, self.rsync_server, self.rsync_options, + db_loc_file, db_ssh_str, self.sq_root, self.wxobs_debug, + self.log_success) if self.send_inc: # perform include file transfer if wanted inc_loc_file = "%s" % (self.include_file) inc_ssh_str = "%s@%s:%s/" % (self.rsync_user, self.rsync_server, - rsync_option, sself.inc_path) - Rsync(self.rsync_user, self.rsync_server, inc_loc_file, inc_ssh_str, - self.inc_path, self.wxobs_debug, self.log_success) + self.inc_path) + Rsync(self.rsync_user, self.rsync_server, self.rsync_option, + inc_loc_file, inc_ssh_str, self.inc_path, self.wxobs_debug, + self.log_success) diff --git a/install.py b/install.py index 60c5470..95945ec 100644 --- a/install.py +++ b/install.py @@ -11,7 +11,7 @@ def loader(): class wxobsInstaller(ExtensionInstaller): def __init__(self): super(wxobsInstaller, self).__init__( - version="0.6.2", + version="0.6.3", name='wxobs', description='Generates weewx report page that uses php to extract' 'archival data (Daily climatological summaries) from the weewx' diff --git a/skins/wxobs/wxobs.inc b/skins/wxobs/wxobs.inc index e449a78..898f981 100644 --- a/skins/wxobs/wxobs.inc +++ b/skins/wxobs/wxobs.inc @@ -24,7 +24,8 @@ ## 04-02-2018 rename include file to reflect database name. (allows parallel setups) ## 06-02-2018 allow both files to be moved as a set, to any writable position, create ## nested directories on first pass. add tooltip -## Version 0.6.2 +## 08-02-2018 Tweak display, add rsync_options (undocumented except in wxobs.py) +## Version 0.6.3 @@ -37,7 +38,7 @@
Choose the date: - +
Wiki notes that may help for this, and setting up remote servers.

"; } require '$include_file'; - echo "$include_file"; +/* echo "$include_file";*/ /* * ToDo ?? @@ -915,7 +916,9 @@ if ($debug =='1') {

"; return; } - $this_day = date('d-M-Y', $pick_start); + /* Return day-month-year only */ + /* $this_day = date('d-M-Y', $pick_start); */ + $minmax_day = date('d-m-Y'); if ($debug == '1') { echo "Min Max:
latest date = ", hDate($latest_date), " : day_start = ", @@ -930,7 +933,7 @@ if ($debug =='1') { // Create Min Max table headers - ugly layout but ok in html source echo "

Historical Observations for $this_day

-

Min (Max) Stats

+

Stats for the day : Min (Max) or Averages

@@ -955,7 +958,9 @@ if ($debug =='1') { } - echo ""; + /* Return day-month-year only + echo ""; */ + echo ""; $x = $tempConvert ($stats_row[1]); $minTemp = round($x, 1); $x = $tempConvert ($stats_row[2]);
$dbase_date
$dbase_date
$minmax_day   - -:- -