--- loncom/interface/lonmeta.pm 2005/12/15 22:18:57 1.139 +++ loncom/interface/lonmeta.pm 2005/12/19 16:00:05 1.140 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.139 2005/12/15 22:18:57 banghart Exp $ +# $Id: lonmeta.pm,v 1.140 2005/12/19 16:00:05 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -289,7 +289,26 @@ sub fieldnames { } return &Apache::lonlocal::texthash(%fields); } - +sub pre_select_course { + my ($r,$uri) = @_; + my $output; + my $fn=&Apache::lonnet::filelocation('',$uri); + my $disuri=$uri; + %Apache::lonpublisher::metadatafields=(); + %Apache::lonpublisher::metadatakeys=(); + my $result=&Apache::lonnet::getfile($fn); + if ($result == -1){ + $r->print('Creating new '.$disuri); + } else { + &Apache::lonpublisher::metaeval($result); + } + $r->print('
'); + $output = &select_course(); + $r->print($output.'
'); + $r->print('
'); + return; +} sub select_course { my %courses; my $output; @@ -303,6 +322,7 @@ sub select_course { $courses{$coursekey} = $value; } } + &Apache::lonnet::logthis('the restricted is'.$Apache::lonpublisher::metadatafields{'courserestricted'}); my $meta_not_found = 1; if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq 'none') { $selected = ' SELECTED '; @@ -648,11 +668,15 @@ sub handler { # Looking for all bombs? &report_bombs($r,$uri); } elsif ($uri=~/\/portfolio\//) { - ($resdomain,$resuser)= + ($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'); + if ($env{'form.store'}) { + &present_editable_metadata($r,$uri,'portfolio'); + } else { + &pre_select_course($r,$uri); + } } elsif ($uri=~/^\/\~/) { # Construction space $r->print(&Apache::loncommon::bodytag @@ -1074,7 +1098,7 @@ ENDEDIT my @fields; if ($file_type eq 'portfolio') { @fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel', - 'highestgradelevel','standards','courserestricted'); + 'highestgradelevel','standards'); } else { @fields = ('author','title','subject','keywords','abstract','notes', 'copyright','customdistributionfile','language',