From: Fabian Keil Date: Sat, 12 Dec 2009 11:31:17 +0000 (+0000) Subject: Highlight: pcrs command "s@^http://([^.]+?)/?$@http://www.bing.com/search?q=$1@"... X-Git-Tag: v_3_0_16~113 X-Git-Url: http://www.privoxy.org/gitweb/%22https:/@default-cgi@toggle?a=commitdiff_plain;h=c909a1b6f5ddbf9184c0bd5a8032c253ae73153c;p=privoxy.git Highlight: pcrs command "s@^([^.]+?)/?$@http://bing.com/search?q=$1@" didn't change "http://www.example.org/". Also remove some unused variables. --- diff --git a/tools/privoxy-log-parser.pl b/tools/privoxy-log-parser.pl index 076f0204..ddf4fe0b 100755 --- a/tools/privoxy-log-parser.pl +++ b/tools/privoxy-log-parser.pl @@ -8,7 +8,7 @@ # # http://www.fabiankeil.de/sourcecode/privoxy-log-parser/ # -# $Id: privoxy-log-parser.pl,v 1.59 2009/11/10 16:19:38 fabiankeil Exp $ +# $Id: privoxy-log-parser.pl,v 1.60 2009/11/10 16:20:18 fabiankeil Exp $ # # TODO: # - LOG_LEVEL_CGI, LOG_LEVEL_ERROR, LOG_LEVEL_WRITE content highlighting @@ -1233,13 +1233,11 @@ sub handle_loglevel_redirect ($) { $c = highlight_matched_path($c, '(?<=Checking ")[^"]*'); $c =~ s@\"@@g; - } elsif ($c =~ m/^pcrs command "([^""]*)" changed "([^""]*)" to "([^""]*)" \((\d+) hits?\)/) { + } elsif ($c =~ m/^pcrs command "([^""]*)" changed /) { - # pcrs command "s@&from=rss@@" changed "http://it.slashdot.org/article.pl?sid=07/03/02/1657247&from=rss"\ + # pcrs command "s@&from=rss@@" changed \ + # "http://it.slashdot.org/article.pl?sid=07/03/02/1657247&from=rss"\ # to "http://it.slashdot.org/article.pl?sid=07/03/02/1657247" (1 hit). - - my ($pcrs_command, $url_before, $url_after, $hits) = ($1, $2, $3, $4); # XXX: save these? - $c =~ s@(?<=pcrs command )"([^""]*)"@$h{'filter'}$1$h{'Standard'}@; $c = highlight_matched_url($c, '(?<=changed ")[^""]*'); $c =~ s@(?<=changed )"([^""]*)"@$1@; # Remove quotes @@ -1247,6 +1245,13 @@ sub handle_loglevel_redirect ($) { $c =~ s@(?<=to )"([^""]*)"@$1@; # Remove quotes $c =~ s@(\d+)(?= hits?)@$h{'hits'}$1$h{'Standard'}@; + } elsif ($c =~ m/^pcrs command "([^""]*)" didn\'t change/) { + + # pcrs command "s@^http://([^.]+?)/?$@http://www.bing.com/search?q=$1@" didn't \ + # change "http://www.example.org/". + $c =~ s@(?<=pcrs command )"([^""]*)"@$h{'filter'}$1$h{'Standard'}@; + $c = highlight_matched_url($c, '(?<=change ")[^""]*'); + } elsif ($c =~ m/(^New URL is: )(.*)/) { # New URL is: http://it.slashdot.org/article.pl?sid=07/03/04/1511210