--- loncom/interface/lonmeta.pm 2005/08/27 23:25:18 1.108 +++ loncom/interface/lonmeta.pm 2005/10/06 22:20:30 1.110 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.108 2005/08/27 23:25:18 banghart Exp $ +# $Id: lonmeta.pm,v 1.110 2005/10/06 22:20:30 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -575,6 +575,8 @@ sub handler { # Looking for all bombs? &report_bombs($r,$uri); } elsif ($uri=~/\/portfolio\//) { + ($resdomain,$resuser)= + (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|); $r->print(&Apache::loncommon::bodytag ('Edit Portfolio File Information','','','',$resdomain)); &present_editable_metadata($r,$uri,'portfolio'); @@ -930,6 +932,7 @@ sub present_editable_metadata { my $fn=&Apache::lonnet::filelocation('',$uri); $disuri=~s/^\/\~/\/priv\//; $disuri=~s/\.meta$//; + $disuri=~s|^/editupload||; my $target=$uri; $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//; $target=~s/\.meta$//; @@ -983,7 +986,7 @@ ENDDEL %Apache::lonpublisher::metadatakeys=(); my $result=&Apache::lonnet::getfile($fn); if ($result == -1){ - $r->print('Creating new '.$fn); + $r->print('Creating new '.$disuri); } else { &Apache::lonpublisher::metaeval($result); }