--- loncom/interface/lonmeta.pm 2006/08/10 21:14:10 1.167 +++ loncom/interface/lonmeta.pm 2006/09/11 22:48:47 1.174 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.167 2006/08/10 21:14:10 banghart Exp $ +# $Id: lonmeta.pm,v 1.174 2006/09/11 22:48:47 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -237,12 +237,6 @@ sub fieldnames { if (! defined($file_type) || $file_type ne 'portfolio') { %fields = - (%fields, - 'courserestricted' => 'Course Restricting Metadata'); - } - - if (! defined($file_type) || $file_type ne 'portfolio') { - %fields = (%fields, 'domain' => 'Domain', 'mime' => 'MIME Type', @@ -366,15 +360,15 @@ sub pre_select_course { $output = &select_course(); $r->print($output.'
'); + $r->print(''); + $r->print(''); $r->print(''); my ($port_path,$group) = &get_port_path_and_group($uri); my $group_input; if ($group) { - $group_input = '' - } else { - $group_input = ""; - } + $group_input = ''; + } $r->print('

'. ''. $group_input. @@ -607,9 +601,11 @@ sub prettyinput { return (&select_course()); # return (''); } + my $course = $env{'request.course.id'}; if (($type eq 'keywords') || ($type eq 'subject') || ($type eq 'author')||($type eq 'notes') - || ($type eq 'abstract')|| ($type eq 'title')|| ($type eq 'standards')) { + || ($type eq 'abstract')|| ($type eq 'title')|| ($type eq 'standards') + || (exists($env{'course.'.$env{'request.course.id'}.'metadata.'.$type.'.added'}))) { if ($values) { if ($only_one) { $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,%meta_options)); @@ -719,14 +715,14 @@ sub prettyinput { # Main Handler sub handler { my $r=shift; - # + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['currentpath']); my $uri=$r->uri; # # Set document type &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; - # my ($resdomain,$resuser)= (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//); if ($uri=~m:/adm/bombs/(.*)$:) { @@ -744,6 +740,12 @@ sub handler { } else { &pre_select_course($r,$uri); } + } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) { + $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information', + undef, + {'domain' => $resdomain,})); + + &present_editable_metadata($r,$uri,'groups'); } elsif ($uri=~m|^/~|) { # Construction space $r->print(&Apache::loncommon::start_page('Edit Catalog nformation', @@ -1104,7 +1106,7 @@ sub print_dynamic_metadata { ##################################################### ##################################################### sub present_editable_metadata { - my ($r,$uri, $file_type) = @_; + my ($r,$uri,$file_type) = @_; # Construction Space Call # Header my $disuri=$uri; @@ -1145,7 +1147,7 @@ sub present_editable_metadata { my $goback=&mt('Back to Source File'); $r->print(<$disuri - + ENDBOMBS if ($showdel) { $r->print(<print(<$displayfile - + ENDEDIT - $r->print(''); my %lt=&fieldnames($file_type); my $output; my @fields; + my $added_metadata_fields; if ($file_type eq 'portfolio') { - @fields = ('author','title','subject','keywords','abstract', - 'notes','lowestgradelevel', - 'highestgradelevel','standards'); + if(exists ($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'})) { + # retrieve fieldnames (in order) from the course restricted list + @fields = (split /,/,$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'}); + } else { + # no saved field list, use default list + @fields = ('author','title','subject','keywords','abstract', + 'notes','lowestgradelevel', + 'highestgradelevel','standards'); + $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames(); + $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join (",",@fields); + } } else { @fields = ('author','title','subject','keywords','abstract','notes', 'copyright','customdistributionfile','language', @@ -1194,8 +1205,12 @@ ENDEDIT 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights', 'obsolete','obsoletereplacement'); } + if ($file_type eq 'groups') { + $Apache::lonpublisher::metadatafields{'courserestricted'}= + 'course.'.$env{'request.course.id'}; + } if ((! $Apache::lonpublisher::metadatafields{'courserestricted'}) && - (! $env{'form.new_courserestricted'})) { + (! $env{'form.new_courserestricted'}) && (! $file_type eq 'groups')) { $Apache::lonpublisher::metadatafields{'courserestricted'}= 'none'; } elsif ($env{'form.new_courserestricted'}) { @@ -1206,7 +1221,7 @@ ENDEDIT $Apache::lonpublisher::metadatafields{'copyright'}= 'default'; } - if ($file_type eq 'portfolio') { + if (($file_type eq 'portfolio') || ($file_type eq 'groups')) { if (! $Apache::lonpublisher::metadatafields{'mime'}) { ($Apache::lonpublisher::metadatafields{'mime'}) = ( $target=~/\.(\w+)$/ ); @@ -1224,7 +1239,6 @@ ENDEDIT } } foreach my $field_name (@fields) { - if (defined($env{'form.new_'.$field_name})) { $Apache::lonpublisher::metadatafields{$field_name}= join(',',&Apache::loncommon::get_env_multiple('form.new_'.$field_name)); @@ -1250,6 +1264,12 @@ ENDEDIT } } + foreach my $field_name (keys(%$added_metadata_fields)) { + my $course = $env{'request.course.id'}; + $output.=('

'.$$added_metadata_fields{$field_name}.': '. + &prettyinput($field_name,$env{'course.'.$env{'request.course.id'}.'metadata.'.$field_name.'.value'}, + 'new_'.$field_name,'addedmeta').'

') + } if ($env{'form.store'}) { my $mfh; my $formname='store'; @@ -1259,21 +1279,21 @@ ENDEDIT join (',', &Apache::loncommon::get_env_multiple('form.new_keywords')); } - foreach (sort keys %Apache::lonpublisher::metadatafields) { - next if ($_ =~ /\./); - my $unikey=$_; + foreach my $field (sort keys %Apache::lonpublisher::metadatafields) { + next if ($field =~ /\./); + my $unikey=$field; $unikey=~/^([A-Za-z]+)/; my $tag=$1; $tag=~tr/A-Z/a-z/; $file_content.= "\n\<$tag"; - foreach (split(/\,/, + foreach my $key (split(/\,/, $Apache::lonpublisher::metadatakeys{$unikey}) ) { my $value= - $Apache::lonpublisher::metadatafields{$unikey.'.'.$_}; + $Apache::lonpublisher::metadatafields{$unikey.'.'.$key}; $value=~s/\"/\'\'/g; - $file_content.=' '.$_.'="'.$value.'"' ; - # print $mfh ' '.$_.'="'.$value.'"'; + $file_content.=' '.$key.'="'.$value.'"' ; + # print $mfh ' '.$key.'="'.$value.'"'; } $file_content.= '>'. &HTML::Entities::encode @@ -1281,14 +1301,20 @@ ENDEDIT '<>&"'). ''; } - if ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles/portfolio/|) { - my ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|); + if ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles|) { + my ($path, $new_fn); + if ($fn =~ m|\w+/groups/\w+/portfolio/|) { + ($path, $new_fn) = ($fn =~ m|/(groups/\w+/portfolio.*)/([^/]*)$|); + } else { + ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|); + } $r->print(&store_portfolio_metadata($formname,$file_content,$path, - $new_fn)); - } elsif ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles/groups/\w+/portfolio/|) { - my ($path, $new_fn) = ($fn =~ m|/(groups/\w+/portfolio.*)/([^/]*)$|); - $r->print(&store_portfolio_metadata($formname,$file_content,$path,$new_fn)); - } else { + $new_fn)); + if (! $env{'form.associate'}) { + $r->print(&Apache::portfolio::done("Return to Portfolio",'/adm/portfolio')); + return; + } + } else { if (! ($mfh=Apache::File->new('>'.$fn))) { $r->print('

'. &mt('Could not write metadata').', '. @@ -1299,22 +1325,27 @@ ENDEDIT ' '.&Apache::lonlocal::locallocaltime(time). '

'); } + if (! $env{'form.associate'}) { + $r->print(&Apache::portfolio::done("Return to Portfolio",'/adm/portfolio')); + return; + } } } $r->print($output.'
'); + &mt('Store Catalog Information').'" />'); if ($file_type eq 'portfolio') { my ($port_path,$group) = &get_port_path_and_group($uri); if ($group) { $r->print(''); } + $r->print(''); $r->print(' -

'. +

'. ''. ''. - ''); + ''); } }