egg-tcls: urllog.tcl comparison

comparison urllog.tcl @ 594:a488be0f45e0

urllog: More cleanups.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 28 Jan 2021 12:47:20 +0200
parents	ac72a228089b
children	7f7d8048ecb5

comparison

equal deleted inserted replaced

-:3bd5a5e072ad
+:a488be0f45e0
 return "\[ $urllog_shorturl_prefix[urllog_get_ss $u1][urllog_get_ss $u2][urllog_get_ss $u3] \]"
 }
-proc urllog_chop_url {ustr} {
+proc urllog_chop_str {ustr umax} {
-global urllog_shorturl_max_orig
+if {[string length $ustr] > $umax} {
+return "[string range $ustr 0 $umax]..."
-if {[string length $ustr] > $urllog_shorturl_max_orig} {
-return "[string range $ustr 0 $urllog_shorturl_max_orig]..."
 } else {
 return $ustr
 }
 }
-proc urllog_chop_title {ustr} {
-global urllog_title_max
-if {[string length $ustr] > $urllog_title_max} {
-return "[string range $ustr 0 $urllog_title_max]..."
-} else {
-return $ustr
-}
-}
 #-------------------------------------------------------------------------
 proc urllog_add_url {urlStr urlNick urlHost urlChan urlTitle} {
-global urllog_db urllog_shorturl urllog_pub_channels
+global urllog_db urllog_shorturl_enable urllog_pub_channels
+global urllog_add_title_max urllog_add_url_max
 ### Does the URL already exist?
 set usql "SELECT id AS uid, utime AS utime, url AS uurl, user AS uuser, host AS uhost, chan AS uchan, title AS utitle FROM urls WHERE url='[utl_escape $urlStr]'"
 urllog_db eval $usql {
 urllog_log "URL said by $urlNick ($urlStr) already known"
 if {[utl_match_delim_list $urllog_pub_channels $uchan]} {
-if {$urllog_shorturl != 0} {
+if {$urllog_shorturl_enable != 0} {
 urllog_verb_msg 1 $urlNick $urlChan "url_known_short" [list $uuser $uchan $uhost [utl_ctime $utime] $utitle $uurl [urllog_get_short $uid]]
 } else {
 urllog_verb_msg 1 $urlNick $urlChan "url_known_long" [list $uuser $uchan $uhost [utl_ctime $utime] $utitle $uurl]
 }
 }
 set uid [urllog_db last_insert_rowid]
 urllog_log "Added URL ($urlNick@$urlChan): $urlStr"
 ### Let's say something, to confirm that everything went well.
-if {$urllog_shorturl != 0} {
+if {$urllog_shorturl_enable != 0} {
 set urlShort [urllog_get_short $uid]
 set ushort "short"
 } else {
 set urlShort ""
 set ushort "long"
 set umode "url_added_${ushort}_has_title"
 } else {
 set umode "url_added_${ushort}_no_title"
 }
-urllog_verb_msg 1 $urlNick $urlChan $umode [list $urlTitle [urllog_chop_title $urlTitle] $urlStr [urllog_chop_url $urlStr] $urlShort]
+urllog_verb_msg 1 $urlNick $urlChan $umode [list $urlTitle [urllog_chop_str $urlTitle $urllog_add_title_max] $urlStr [urllog_chop_str $urlStr $urllog_add_url_max] $urlShort]
 return 1
 }
 #-------------------------------------------------------------------------
 }
 #-------------------------------------------------------------------------
 proc urllog_validate_url { urlNick urlChan urlMStr urlMProto urlMHostName } {
-global urllog_httprep urllog_shorturl_prefix urllog_shorturl
+global urllog_httprep urllog_shorturl_prefix urllog_shorturl_enable
 upvar $urlMStr urlStr
 upvar $urlMProto urlProto
 upvar $urlMHostName urlHostName
 }
 #-------------------------------------------------------------------------
 ### Parse arguments, find and show the results
-proc urllog_cmd_find {unick uhand uchan utext upublic} {
+proc urllog_cmd_search {unick uhand uchan utext upublic} {
-global urllog_db urllog_shorturl urllog_showmax_pub urllog_showmax_priv
+global urllog_db urllog_shorturl_enable urllog_showmax_pub urllog_showmax_priv
+global urllog_search_title_max urllog_search_url_max
 if {$upublic == 0} {
 set ulimit 5
 } else {
 set ulimit 3
 ### Perform SQL query and show results if any
 set nresult 0
 set usql "SELECT id AS uid, utime AS utime, url AS uurl, user AS uuser, host AS uhost, title AS utitle FROM urls $fquery ORDER BY utime DESC LIMIT $ulimit"
 urllog_db eval $usql {
 incr nresult
-if {[info exists $utitle] && [string length $utitle] > 0} {
+if {[string length $utitle] > 0} {
-set stitle [utl_str_map_values [urllog_qm "search_result_title"] [list $utitle [urllog_chop_title $utitle]]]
+set stitle [utl_str_map_values [urllog_qm "search_result_has_title"] [list $utitle [urllog_chop_str $utitle $urllog_search_title_max]]]
 } else {
 set stitle [urllog_qm "search_result_no_title"]
 }
-if {$urllog_shorturl != 0 && $uid != ""} {
+if {$urllog_shorturl_enable != 0 && $uid != ""} {
-urllog_msg $upublic $unick $uchan "search_result_short" [list $nresult $uuser [utl_ctime $utime] $stitle [urllog_chop_url $uurl] [urllog_get_short $uid]]
+urllog_msg $upublic $unick $uchan "search_result_short" [list $nresult $uuser [utl_ctime $utime] $stitle [urllog_chop_str $uurl $urllog_search_url_max] [urllog_get_short $uid]]
 } else {
 urllog_msg $upublic $unick $uchan "search_result_long" [list $nresult $uuser [utl_ctime $utime] $stitle $uurl]
 }
 }
 }
 #-------------------------------------------------------------------------
 ### Finding binded functions
-proc urllog_cmd_pub_find {unick uhost uhand uchan utext} {
+proc urllog_cmd_pub_search {unick uhost uhand uchan utext} {
 global urllog_search_channels
 if {[utl_match_delim_list $urllog_search_channels $uchan]} {
-return [urllog_cmd_find $unick $uhand $uchan $utext 1]
+return [urllog_cmd_search $unick $uhand $uchan $utext 1]
 }
 return 0
 }
-proc urllog_cmd_msg_find {unick uhost uhand utext} {
+proc urllog_cmd_msg_search {unick uhost uhand utext} {
-return [urllog_cmd_find $unick $uhand "" $utext 0]
+return [urllog_cmd_search $unick $uhand "" $utext 0]
 }
 #-------------------------------------------------------------------------
 # Script initialization

Mercurial > hg > egg-tcls

comparison urllog.tcl @ 594:a488be0f45e0