comparison quotedb.tcl @ 529:3046ee0e574d

quotedb: Use utillib version of the function.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 07 Jul 2020 14:22:06 +0300
parents 1cfa567f9500
children a7e44605c930
comparison
equal deleted inserted replaced
528:20a1b0f39f71 529:3046ee0e574d
64 } 64 }
65 } 65 }
66 66
67 67
68 proc qdb_msg {acmd atable apublic anick achan aid {aargs {}}} { 68 proc qdb_msg {acmd atable apublic anick achan aid {aargs {}}} {
69 global qdb_preferredmsg qdb_messages 69 global qdb_preferredmsg
70 70
71 # Get message 71 # Get message
72 set amsg [qdb_qm $atable $aid] 72 set amsg [qdb_qm $atable $aid]
73 set aname [qdb_qm $atable "name"] 73 set aname [qdb_qm $atable "name"]
74 74
75 # Map constant tokens 75 # Map constant tokens
76 set amsg [string map [list "@cmd@" $acmd] $amsg] 76 set amsg [string map [list "@cmd@" $acmd] $amsg]
77 set amsg [string map [list "@name@" $aname] $amsg] 77 set amsg [string map [list "@name@" $aname] $amsg]
78 set amsg [string map [list "@nick@" $anick] $amsg] 78
79 set amsg [string map [list "@chan@" $achan] $amsg] 79 utl_msg_args $qdb_preferredmsg $apublic $anick $achan $amsg $aargs
80
81 # Map variable tokens
82 set narg 1
83 foreach marg $aargs {
84 set amsg [string map [list "@$narg@" $marg] $amsg]
85 incr narg
86 }
87
88 utl_msg_do $qdb_preferredmsg $apublic $anick $achan $amsg
89 } 80 }
90 81
91 82
92 proc qdb_sql_exec {ucmd utable upublic unick uchan usql} { 83 proc qdb_sql_exec {ucmd utable upublic unick uchan usql} {
93 global qdb_handle 84 global qdb_handle