diff -r 3487e8b7ed38 -r f593b7acdb37 uh_parser/RaptorError.pm --- a/uh_parser/RaptorError.pm Thu May 06 12:47:02 2010 +0100 +++ b/uh_parser/RaptorError.pm Thu May 06 18:06:35 2010 +0100 @@ -190,7 +190,7 @@ my $package = ''; # if bldinf attribute is not available then heuristically attempt to determine the package if (!$raptor_error_info->{bldinf} && - $characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][^/^\\]*[/\\]),s) + $characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][a-zA-Z]+[/\\]?),s) { $raptor_error_info->{bldinf} = "$1... (guessed)"; } @@ -204,7 +204,7 @@ $raptor_error_info->{bldinf} =~ s,^[A-Za-z]:,,; $raptor_error_info->{bldinf} =~ s,[\\],/,g; - if ($raptor_error_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[^/]*),) + if ($raptor_error_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[a-zA-Z]+),) { $package = $1; $package =~ s,/,_,;