--- loncom/interface/lonnavmaps.pm 2006/03/17 21:33:17 1.372 +++ loncom/interface/lonnavmaps.pm 2006/03/19 19:50:40 1.373 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.372 2006/03/17 21:33:17 raeburn Exp $ +# $Id: lonnavmaps.pm,v 1.373 2006/03/19 19:50:40 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2402,7 +2402,7 @@ sub unread_discussion { sub wrap_symb { my $self = shift; my $symb = shift; - if ($symb =~ m-___(adm/\w+/\w+/)(\d+)(/bulletinboard)$-) { + if ($symb =~ m-___(adm/[^/]+/[^/]+/)(\d+)(/bulletinboard)$-) { unless ($symb =~ m|adm/wrapper/adm|) { $symb = 'bulletin___'.$2.'___adm/wrapper/'.$1.$2.$3; } @@ -2414,7 +2414,7 @@ sub unwrap_symb { my $self = shift; my $ressymb = shift; my $discsymb = $ressymb; - if ($ressymb =~ m-^(bulletin___\d+___)adm/wrapper/(adm/\w+/\w+/\d+/bulletinboard)$-) { + if ($ressymb =~ m-^(bulletin___\d+___)adm/wrapper/(adm/[^/]+/[^/]+/\d+/bulletinboard)$-) { $discsymb = $1.$2; } return $discsymb;