--- trunk/lib/Frey/SVN.pm 2008/12/09 20:31:31 770 +++ trunk/lib/Frey/SVN.pm 2008/12/10 22:49:31 804 @@ -25,25 +25,9 @@ default => 50, ); -sub as_markup { - my ($self) = @_; - - # extract svk revision: r113@athlon (orig r999): dpavlin | 2005-09-01 20:38:07 +0200 - my $svk_rev_re = '\s+(r\d+@\w+(\s+\(orig\s+r\d+\))*:\s+\w+\s+\|\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\s+\+\d+)\s*'; - - sub encode { - my $foo = shift; - $foo =~ s/$svk_rev_re//gsm; - $foo =~ s//>/g; - $foo =~ s/"/"/g; - $foo =~ s/([\n\r][\n\r]+)/<\/p>$1

/gis; - $foo =~ s/([\n\r]+)([\-\*]\s+)/$1$2/gis; - $foo =~ s/([\n\r]+)(r\d+:\s+)/$1$2/gis; - $foo =~ s/([\n\r]+)(\s+r\d+@)/$1$2/gis; # svk - return $foo; - } - +sub iterator { + my ($self,$coderef) = @_; + sub sh_regex($$) { my ($cmd,$regex) = @_; open(my $sh, $cmd . ' |') || die "sh_regex failed on $cmd: $!"; @@ -105,12 +89,39 @@ my $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]); + foreach my $e (@{$xml->{'logentry'}}) { + warn "# e = ",$self->dump( $e ); + $coderef->($e); + } +} + +sub as_markup { + my ($self) = @_; + + # extract svk revision: r113@athlon (orig r999): dpavlin | 2005-09-01 20:38:07 +0200 + our $svk_rev_re = '\s+(r\d+@\w+(\s+\(orig\s+r\d+\))*:\s+\w+\s+\|\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\s+\+\d+)\s*'; + + sub encode { + my $foo = shift; + $foo =~ s/$svk_rev_re//gsm; + $foo =~ s//>/g; + $foo =~ s/"/"/g; + $foo =~ s/([\n\r][\n\r]+)/<\/p>$1

/gis; + $foo =~ s/([\n\r]+)([\-\*]\s+)/$1$2/gis; + $foo =~ s/([\n\r]+)(r\d+:\s+)/$1$2/gis; + $foo =~ s/([\n\r]+)(\s+r\d+@)/$1$2/gis; # svk + return $foo; + } + our $html = ''; sub html { $html .= join("\n", @_); } - foreach my $e (@{$xml->{'logentry'}}) { + $self->iterator( sub { + my $e = shift; + my $rev = $e->{'revision'}; my $date = $e->{'date'}; @@ -135,7 +146,7 @@ html '

',join(", ",@files),': ',encode($e->{'msg'}),'

'; - } + }); return $html; }