comparison tj.tcl @ 634:fd1c56676648

tj: Use uclock uniformly in tj_cmd.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 16 Feb 2021 12:27:41 +0200
parents bc87660aa400
children 4fbe70d3b63a
comparison
equal deleted inserted replaced
633:bc87660aa400 634:fd1c56676648
288 return 1 288 return 1
289 } 289 }
290 } 290 }
291 291
292 # Compute target timestamp 292 # Compute target timestamp
293 set rstamp [expr [clock seconds] + ($rdays * 24 * 60 * 60) + ($rhours * 60 * 60)] 293 set rstamp [expr $uclock + ($rdays * 24 * 60 * 60) + ($rhours * 60 * 60)]
294 } else { 294 } else {
295 # Only description, if any 295 # Only description, if any
296 if {![tj_arg_rest $rarglist 1 rdesc]} { 296 if {![tj_arg_rest $rarglist 1 rdesc]} {
297 tj_msg $upublic $unick $uchan "err_invalid_format" [list] 297 tj_msg $upublic $unick $uchan "err_invalid_format" [list]
298 return 1 298 return 1
330 } else { 330 } else {
331 set rdate [utl_sql_stamp_to_datetime $rstamp] 331 set rdate [utl_sql_stamp_to_datetime $rstamp]
332 set ustamp $rstamp 332 set ustamp $rstamp
333 } 333 }
334 334
335 set utjstr [tj_get_tj_str_delta $rstamp] 335 set utjstr [tj_get_tj_str_delta $rstamp $uclock]
336 set udate [tj_ctime $ustamp] 336 set udate [tj_ctime $ustamp]
337 337
338 # Max reminders .. 338 # Max reminders ..
339 set usql "SELECT COUNT(*) FROM tj WHERE uuser='[utl_escape $uhand]'" 339 set usql "SELECT COUNT(*) FROM tj WHERE uuser='[utl_escape $uhand]'"
340 if {[catch {set nitems [tj_dbh onecolumn $usql]} uerrmsg]} { 340 if {[catch {set nitems [tj_dbh onecolumn $usql]} uerrmsg]} {
347 if {$nitems >= $tj_max_items} { 347 if {$nitems >= $tj_max_items} {
348 tj_msg $upublic $unick $uchan "err_too_many" [list $nitems $tj_max_items] 348 tj_msg $upublic $unick $uchan "err_too_many" [list $nitems $tj_max_items]
349 return 1 349 return 1
350 } 350 }
351 351
352 set ucreated [utl_sql_stamp_to_datetime [clock seconds]] 352 set ucreated [utl_sql_stamp_to_datetime $uclock]
353 if {$umode} { 353 if {$umode} {
354 # Insert new entry 354 # Insert new entry
355 set usql "INSERT INTO tj (uid,uuser,ucreated,uupdated,udesc,utype,utarget) VALUES ('[utl_escape $uid]', '[utl_escape $uhand]', '$ucreated', '$ucreated', '[utl_escape $rdesc]', 0, '$rdate')" 355 set usql "INSERT INTO tj (uid,uuser,ucreated,uupdated,udesc,utype,utarget) VALUES ('[utl_escape $uid]', '[utl_escape $uhand]', '$ucreated', '$ucreated', '[utl_escape $rdesc]', 0, '$rdate')"
356 if {[catch {tj_dbh eval $usql} uerrmsg]} { 356 if {[catch {tj_dbh eval $usql} uerrmsg]} {
357 tj_msg $upublic $unick $uchan "err_sql" [list $uerrmsg] 357 tj_msg $upublic $unick $uchan "err_sql" [list $uerrmsg]