Mercurial > hg > egg-tcls

comparison tj.tcl @ 614:8c61b4032648

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tj: Cleanup. Rename some variables to be more descriptive. Add a comment.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 10 Feb 2021 11:30:11 +0200
parents ea6ebcf42b47
children 1dac9129eb0f
comparison
equal deleted inserted replaced
613:ea6ebcf42b47 614:8c61b4032648
121 lappend ulist [utl_str_map_values [tj_qm "tj_str_${qfmt}"] [list $qvalue]] 121 lappend ulist [utl_str_map_values [tj_qm "tj_str_${qfmt}"] [list $qvalue]]
122 } 122 }
123 } 123 }
124 124
125 125
126 proc tj_get_tj_str {udelta} { 126 # Return string describing how many years,days,hours,etc
127 127 # the given number of seconds consists of
128 if {$udelta < 0} { 128 proc tj_get_tj_str {useconds} {
129 set utmp [expr -$udelta] 129
130 } else { 130 set uyears [expr ($useconds / (365*24*60*60))]
131 set utmp $udelta 131 set urem [expr ($useconds % (365*24*60*60))]
132 }
133
134 set uyears [expr ($utmp / (365*24*60*60))]
135 set urem [expr ($utmp % (365*24*60*60))]
136 set udays [expr ($urem / (24*60*60))] 132 set udays [expr ($urem / (24*60*60))]
137 set urem [expr ($urem % (24*60*60))] 133 set urem [expr ($urem % (24*60*60))]
138 set uhours [expr ($urem / (60*60))] 134 set uhours [expr ($urem / (60*60))]
139 set urem [expr ($urem % (60*60))] 135 set urem [expr ($urem % (60*60))]
140 set uminutes [expr ($urem / 60)] 136 set uminutes [expr ($urem / 60)]
158 proc tj_get_tj_str_delta { ustamp } { 154 proc tj_get_tj_str_delta { ustamp } {
159 set udelta [expr $ustamp - [clock seconds]] 155 set udelta [expr $ustamp - [clock seconds]]
160 156
161 if {$udelta < 0} { 157 if {$udelta < 0} {
162 set ufmt "tj_past" 158 set ufmt "tj_past"
159 set useconds [expr -$udelta]
163 } else { 160 } else {
164 set ufmt "tj_remaining" 161 set ufmt "tj_remaining"
162 set useconds $udelta
165 } 163 }
166 164
167 # return [utl_str_map_values [tj_qm $ufmt] [list ]] 165 # return [utl_str_map_values [tj_qm $ufmt] [list ]]
168 return [tj_get_tj_str $udelta] 166 return [tj_get_tj_str $useconds]
169 } 167 }
170 168
171 169
172 proc tj_display_tjs {upublic unick uchan uname uid} { 170 proc tj_display_tjs {upublic unick uchan uname uid} {
173 set uclock [clock seconds] 171 set uclock [clock seconds]
178 set ustamp [utl_sql_datetime_to_stamp $utarget] 176 set ustamp [utl_sql_datetime_to_stamp $utarget]
179 set udelta [expr $ustamp - $uclock] 177 set udelta [expr $ustamp - $uclock]
180 178
181 if {$udelta < 0} { 179 if {$udelta < 0} {
182 set ufmt "tj_past" 180 set ufmt "tj_past"
181 set useconds [expr -$udelta]
183 } else { 182 } else {
184 set ufmt "tj_remaining" 183 set ufmt "tj_remaining"
185 } 184 set useconds $udelta
186 185 }
187 tj_msg $upublic $unick $uchan $ufmt [list $uname $uid [tj_get_tj_str $udelta] [tj_ctime $ustamp]] 186
187 tj_msg $upublic $unick $uchan $ufmt [list $uname $uid [tj_get_tj_str $useconds] [tj_ctime $ustamp]]
188 } 188 }
189 189
190 if {!$nresults} { 190 if {!$nresults} {
191 tj_msg $upublic $unick $uchan "tj_not_set" [list $uname $uid] 191 tj_msg $upublic $unick $uchan "tj_not_set" [list $uname $uid]
192 } 192 }