changeset 286:899128d7c408

weather: Remove obsolete function, move one function around.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 23 Jan 2015 17:07:21 +0200
parents 259f093c9503
children 748c6b44f572
files weather.tcl
diffstat 1 files changed, 11 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/weather.tcl	Fri Jan 23 16:59:59 2015 +0200
+++ b/weather.tcl	Fri Jan 23 17:07:21 2015 +0200
@@ -74,21 +74,6 @@
 }
 
 
-proc weather_translate_msg {amsg aargs} {
-  set aresult ""
-  foreach aitem $amsg {
-    set atmp $aitem
-    foreach {akey aval} [array get aargs] {
-      set atmp [string map [list "@${akey}@" $aval] $atmp]
-    }
-    if {$atmp != $aitem} {
-      append aresult $atmp
-    }
-  }
-  return $amsg
-}
-
-
 proc weather_ctime {utime} {
   return [clock format $utime -format "%H:%M"]
 }
@@ -152,12 +137,18 @@
 
 
 #-------------------------------------------------------------------------
-proc weather_item {udata uindex ufmt} {
-  if {[llength $udata] > $uindex && [lindex $udata $uindex] != ""} {
-    set utmp [lindex $udata $uindex]
-    return [string map [list "@@" $utmp] $ufmt]
+proc weather_translate_msg {amsg aargs} {
+  set aresult ""
+  foreach aitem $amsg {
+    set atmp $aitem
+    foreach {akey aval} [array get aargs] {
+      set atmp [string map [list "@${akey}@" $aval] $atmp]
+    }
+    if {$atmp != $aitem} {
+      append aresult $atmp
+    }
   }
-  return ""
+  return $amsg
 }