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