--- loncom/interface/lonmeta.pm 2005/08/04 23:47:37 1.103
+++ 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.103 2005/08/04 23:47:37 banghart Exp $
+# $Id: lonmeta.pm,v 1.110 2005/10/06 22:20:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -575,15 +575,12 @@ 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));
- if ($env{'form.metacourse'}) {
- &present_instructor_metadata($r,$uri,'portfolio');
- } else {
- &present_editable_metadata($r,$uri,'portfolio');
- &select_course($r);
- }
-
+ &present_editable_metadata($r,$uri,'portfolio');
+ &select_course($r);
} elsif ($uri=~/^\/\~/) {
# Construction space
$r->print(&Apache::loncommon::bodytag
@@ -918,14 +915,6 @@ sub print_dynamic_metadata {
return;
}
-sub present_instructor_metadata {
- my ($r,$uri, $file_type) = @_;
- $r->print('This is the instructor metadata area
');
- my $keywords = $env{$env{'form.metacourse'}.'.metadata.keywords'};
- $r->print($env{'form.metacourse'}.'
');
- $r->print('the keywords are: '.$keywords);
- return 'ok';
-}
#####################################################
@@ -943,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$//;
@@ -996,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);
}
@@ -1033,11 +1023,51 @@ ENDEDIT
&prettyinput($_,
$Apache::lonpublisher::metadatafields{$_},
'new_'.$_,'defaultmeta').'