--- loncom/interface/lonmeta.pm 2005/12/19 21:49:12 1.146 +++ loncom/interface/lonmeta.pm 2005/12/19 23:19:18 1.148 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.146 2005/12/19 21:49:12 albertel Exp $ +# $Id: lonmeta.pm,v 1.148 2005/12/19 23:19:18 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -295,11 +295,13 @@ sub portfolio_linked_path { my $result = &Apache::portfolio::make_anchor('portfolio','/'); my $fullpath = '/'; my (undef,@tree) = split('/',$path); + my $filename = pop(@tree); foreach my $dir (@tree) { $fullpath .= $dir.'/'; $result .= '/'; $result .= &Apache::portfolio::make_anchor($dir,$fullpath); } + $result .= "/$filename"; return $result; } @@ -314,7 +316,7 @@ sub portfolio_display_uri { $meta_uri .= '.meta'; } - my ($path) = ($res_uri =~ m|(.*)/[^/]*$|); + my ($path) = ($res_uri =~ m|^portfolio(.*/)[^/]*$|); if ($as_links) { $res_uri = &portfolio_linked_path($res_uri); @@ -1069,8 +1071,9 @@ sub present_editable_metadata { $disuri=~s/^\/\~/\/priv\//; $disuri=~s/\.meta$//; my $meta_uri = $disuri; + my $path; if ($disuri =~ m|/portfolio/|) { - ($disuri, $meta_uri) = &portfolio_display_uri($disuri,1); + ($disuri, $meta_uri, $path) = &portfolio_display_uri($disuri,1); } my $target=$uri; $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//; @@ -1256,7 +1259,12 @@ ENDEDIT $r->print($output.'
'); - + + $r->print(' +

'. + ''. + ''); + } $r->print('
');