Mercurial > hg > egg-tcls
changeset 68:3762c621d1c3
urllog: Cosmetics.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 11 Sep 2011 16:48:48 +0300 |
parents | eb728cebfe2c |
children | df3230f8aa46 |
files | urllog.tcl |
diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/urllog.tcl Sat Sep 10 18:17:20 2011 +0300 +++ b/urllog.tcl Sun Sep 11 16:48:48 2011 +0300 @@ -257,7 +257,7 @@ #------------------------------------------------------------------------- proc urllog_get_short {utime} { - global urllog_shorturl urllog_shorturl_prefix urllog_shorturl + global urllog_shorturl_prefix set ustr "ABCDEFGHIJKLNMOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" set ulen [string length $ustr] @@ -274,6 +274,7 @@ #------------------------------------------------------------------------- proc urllog_chop_url {url} { global urllog_shorturl_orig + if {[string length $url] > $urllog_shorturl_orig} { return "[string range $url 0 $urllog_shorturl_orig]..." } else { @@ -566,9 +567,10 @@ } else { set fquery "" } + set iresults 0 - set query "SELECT id AS urlID, utime AS utime, url AS uurl, user AS uuser, host AS uhost FROM urls $fquery ORDER BY utime DESC LIMIT $ulimit" - urldb eval $query { + set usql "SELECT id AS urlID, utime AS utime, url AS uurl, user AS uuser, host AS uhost FROM urls $fquery ORDER BY utime DESC LIMIT $ulimit" + urldb eval $usql { incr iresults set shortURL $uurl if {$urllog_shorturl != 0 && $urlID != ""} {