changeset 106:fc50d5fd6ce8

urllog: urllog_convert_ent was incorrectly mapping entities first with -nocase, resulting in lowercase characters when uppercase was the correct one. Fixed. Also optimized a bit.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 14 Sep 2011 19:20:39 +0300
parents c81da31e3ab3
children 92b42a867af4
files urllog.tcl
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/urllog.tcl	Tue Sep 13 15:53:52 2011 +0300
+++ b/urllog.tcl	Wed Sep 14 19:20:39 2011 +0300
@@ -249,12 +249,10 @@
 
 proc urllog_convert_ent {udata} {
   global urllog_html_ent
-  regsub -all "  " $udata " " utmp
-  regsub -all "\r" $utmp " " utmp
-  regsub -all "\n" $utmp " " utmp
+  regsub -all "\r|\n" $udata " " utmp
   regsub -all "  *" $utmp " " utmp
   regsub -all "\t" $utmp "" utmp
-  return [string map -nocase $urllog_html_ent $utmp]
+  return [string map -nocase $urllog_html_ent [string map $urllog_html_ent $utmp]]
 }