Mercurial > hg > egg-tcls

changeset 341:6951c3a3f677

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 04 Oct 2015 14:22:55 +0300
parents ade13f17639b (current diff) e01963cb88fd (diff)
children 8212fe58da45
files
diffstat 2 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/utillib.tcl	Sun Oct 04 14:22:32 2015 +0300
+++ b/utillib.tcl	Sun Oct 04 14:22:55 2015 +0300
@@ -15,7 +15,8 @@
 append utl_html_ent_str "|&#124;|-|&#8217;|'|&uuml;|ü|&Uuml;|Ü|&bull;|*|&euro;|€"
 append utl_html_ent_str "|&rdquo;|\"|&#8216;|'|&#xe4;|ä|&#xb7;|*|&#174;|®|&acute;|'"
 append utl_html_ent_str "|&#246;|ö|&#xf6;|ö|&#35;|#|&apos;|'|&shy;||–|-|”|\""
-append utl_html_ent_str "|&#x2026;|...|&hellip;|...|&#34;|\""
+append utl_html_ent_str "|&#x2026;|...|&hellip;|...|&#34;|\"|&#xad;||&#064;|#"
+append utl_html_ent_str "|&#xa0;| "
 set utl_html_ent_list [split [encoding convertfrom "utf-8" $utl_html_ent_str] "|"]
 
 
--- a/weather.tcl	Sun Oct 04 14:22:32 2015 +0300
+++ b/weather.tcl	Sun Oct 04 14:22:55 2015 +0300
@@ -1,6 +1,6 @@
 ##########################################################################
 #
-# Weather v0.9 by Matti 'ccr' Hamalainen <ccr@tnsp.org>
+# Weather v0.9.1 by Matti 'ccr' Hamalainen <ccr@tnsp.org>
 # (C) Copyright 2014-2015 Tecnic Software productions (TNSP)
 #
 # Requires data fetcher to be run as a cronjob, see fetch_weather.pl
@@ -20,7 +20,7 @@
 # No need to look below this line
 ##########################################################################
 set weather_name "Weather"
-set weather_version "0.9"
+set weather_version "0.9.1"
 
 
 ### Initialization messages
@@ -223,9 +223,14 @@
     }
     close $ufile
     
-    # Store min/max 
-    set weather_data(w_min) $weather_data($wtemp_min_key)
-    set weather_data(w_max) $weather_data($wtemp_max_key)
+    # Store min/max
+    if {$wtemp_min_key != "" && $wtemp_max_key != ""} {
+      set weather_data(w_min) $weather_data($wtemp_min_key)
+      set weather_data(w_max) $weather_data($wtemp_max_key)
+    } else {
+      set weather_data(w_min) 0
+      set weather_data(w_max) 0
+    }
   } else {
     weather_log "Could not open data file: $uerrmsg"
   }