--- loncom/interface/lonmeta.pm 2007/01/12 20:04:16 1.195 +++ loncom/interface/lonmeta.pm 2008/12/17 18:47:08 1.212.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.195 2007/01/12 20:04:16 raeburn Exp $ +# $Id: lonmeta.pm,v 1.212.2.4 2008/12/17 18:47:08 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -182,7 +182,7 @@ sub evalgraph { my $val=int($value*10.+0.5)-10; my $output=''; if ($val>=20) { - $output.=''; + $output.=''; } else { $output.=''. ''; @@ -192,7 +192,7 @@ sub evalgraph { $output.=''. ''; } else { - $output.=''; + $output.=''; } $output.='
  '.(' ' x2).'      '.(' ' x2).' ('.sprintf("%5.2f",$value).')
'; return $output; @@ -265,7 +265,7 @@ sub fieldnames { 'correct' => 'Material appears to be correct', 'technical' => 'Resource is technically correct', 'avetries' => 'Average number of tries till solved', - 'stdno' => 'Total number of students who have worked on this problem', + 'stdno' => 'Statistics calculated for number of students', 'difficulty' => 'Degree of difficulty', 'disc' => 'Degree of discrimination', 'dependencies' => 'Resources used by this resource', @@ -383,7 +383,40 @@ sub select_course { $Apache::lonpublisher::metadatafields{'courserestricted'}; my $selected = ($current_restriction eq 'none' ? 'selected="selected"' : ''); - + if ($current_restriction =~ /^course\.($match_domain\_$match_courseid)$/) { + my $assoc_crs = $1; + my $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames($assoc_crs); + if (ref($added_metadata_fields) eq 'HASH') { + if (keys(%{$added_metadata_fields}) > 0) { + my $transfernotes; + foreach my $field_name (keys(%{$added_metadata_fields})) { + my $value = $Apache::lonpublisher::metadatafields{$field_name}; + if ($value) { + $transfernotes .= + &Apache::loncommon::start_data_table_row(). + ''. + $field_name.''.$value.''. + &Apache::loncommon::end_data_table_row(); + } + } + if ($transfernotes ne '') { + my %courseinfo = &Apache::lonnet::coursedescription($assoc_crs,{'one_time' => 1}); + my $assoc_crs_description = $courseinfo{'description'}; + $output .= &mt('This resource is currently associated with a course ([_1]) which includes added metadata fields specific to the course.',$assoc_crs_description).'
'."\n". + &mt('You can choose to transfer data from the added fields to the "Notes" field if you are planning to change the course association.').'

'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + 'Copy to notes?'."\n". + 'Field name'."\n". + 'Values'."\n". + &Apache::loncommon::end_data_table_header_row(). + $transfernotes. + &Apache::loncommon::end_data_table().'
'; + } + } + } + } $output .= ''; - foreach (@idlist) { - $selout.='';} + } else { + $selout.='>'.&{$functionref}($id).''; + } } return $selout.''; } @@ -598,9 +632,16 @@ sub prettyinput { if ($meta_options{$item}) { push(@cur_values_inst,$item); } else { - $cur_values_stu .= $item.','; + if ($item ne '') { + $cur_values_stu .= $item.','; + } } } + $cur_values_stu =~ s/,$//; + my @key_order = sort(keys(%meta_options)); + unshift(@key_order,''); + $meta_options{''} = 'Not specified'; + $meta_options{'select_form_order'} = \@key_order; } else { $cur_values_stu = $value; } @@ -608,11 +649,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') - || (exists($env{'course.'.$env{'request.course.id'}.'.metadata.'.$type.'.added'}))) { + || (exists($env{$course_key.'.metadata.'.$type.'.added'}))) { + if ($values) { if ($only_one) { $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,%meta_options)); @@ -750,7 +791,6 @@ sub handler { %Apache::lonpublisher::metadatakeys=(); my $result=&Apache::lonnet::getfile($fn); &Apache::lonpublisher::metaeval($result); - &Apache::lonnet::logthis("restricted is: ".$Apache::lonpublisher::metadatafields{'courserestricted'}); if ((!$Apache::lonpublisher::metadatafields{'courserestricted'}) || ($env{'form.changecourse'} eq 'true')) { &pre_select_course($r,$uri); @@ -765,8 +805,10 @@ sub handler { &present_editable_metadata($r,$uri,'groups'); } elsif ($uri=~m|^/~|) { # Construction space - $r->print(&Apache::loncommon::start_page('Edit Catalog nformation', - undef, + $r->print(&Apache::loncommon::start_page('Edit Catalog Information', + "\n".'', {'domain' => $resdomain,})); &present_editable_metadata($r,$uri); } else { @@ -798,18 +840,22 @@ sub report_bombs { &Apache::lonmsg::clear_author_res_msg($uri); } my $clear=&mt('Clear all Messages in Subdirectory'); - $r->print(<print(< - +$cancel +
ENDCLEAR my %brokenurls = &Apache::lonmsg::all_url_author_res_msg($author,$domain); - foreach (sort(keys(%brokenurls))) { - if ($_=~/^\Q$uri\E/) { + foreach my $key (sort(keys(%brokenurls))) { + if ($key=~/^\Q$uri\E/) { $r->print - (''.$_.''. - &Apache::lonmsg::retrieve_author_res_msg($_). + (''.$key.''. + &Apache::lonmsg::retrieve_author_res_msg($key). '
'); } } @@ -832,8 +878,8 @@ sub present_uneditable_metadata { my $uploaded = ($uri =~ m|/uploaded/|); my %content=(); # Read file - foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) { - $content{$_}=&Apache::lonnet::metadata($uri,$_); + foreach my $key (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) { + $content{$key}=&Apache::lonnet::metadata($uri,$key); } # Render Output # displayed url @@ -861,9 +907,9 @@ sub present_uneditable_metadata { my $obsolete=$content{'obsolete'}; my $obsoletewarning=''; if (($obsolete) && ($env{'user.adv'})) { - $obsoletewarning='

'. + $obsoletewarning='

'. &mt('This resource has been marked obsolete by the author(s)'). - '

'; + '

'; } # my %lt=&fieldnames(); @@ -899,24 +945,27 @@ sub present_uneditable_metadata { 'obsolete', 'obsoletereplacement'); } + my $rownum = 0; foreach my $field (@fields) { - $table.=''.$lt{$field}. - ''. - &prettyprint($field,$content{$field}).''; + my $lastrow = ''; + $rownum ++; + $lastrow = 1 if ($rownum == @fields); + $table.=&Apache::lonhtmlcommon::row_title($lt{$field}) + .&prettyprint($field,$content{$field}) + .&Apache::lonhtmlcommon::row_closure($lastrow); delete($content{$field}); } # - $r->print(<$title -

-$disuri
-$obsoletewarning -$versiondisplay -

- -$table -
-ENDHEAD + $r->print("

$title

" + .'

' + .$disuri.'
' + .$obsoletewarning + .$versiondisplay + .'

' + .&Apache::lonhtmlcommon::start_pick_box() + .$table + .&Apache::lonhtmlcommon::end_pick_box() + ); if (!$uploaded && $env{'user.adv'}) { &print_dynamic_metadata($r,$uri,\%content); } @@ -943,17 +992,21 @@ sub print_dynamic_metadata { exists($dynmeta{'goto'}) || exists($dynmeta{'course'})) { $r->print('

'.&mt('Access and Usage Statistics').'

'. - ''); - foreach ('count', - 'sequsage','sequsage_list', - 'comefrom','comefrom_list', - 'goto','goto_list', - 'course','course_list') { - $r->print(''. - '\n"); + &Apache::lonhtmlcommon::start_pick_box()); + my @counts = ('count','sequsage','sequsage_list', + 'comefrom','comefrom_list','goto', + 'goto_list','course','course_list'); + my $rownum = 0; + foreach my $item (@counts) { + my $lastrow = ''; + $rownum ++; + $lastrow = 1 if ($rownum == @counts); + $r->print(&Apache::lonhtmlcommon::row_title($lt{$item}) + .&prettyprint($item,$dynmeta{$item}) + .&Apache::lonhtmlcommon::row_closure($lastrow) + ); } - $r->print('
'.$lt{$_}.''. - &prettyprint($_,$dynmeta{$_})."
'); + $r->print(&Apache::lonhtmlcommon::end_pick_box()); } else { $r->print('

'.&mt('No Access or Usages Statistics are available for this resource.').'

'); } @@ -968,35 +1021,40 @@ sub print_dynamic_metadata { $r->print('

'. &mt('Overall Assessment Statistical Data'). '

'. - ''); - $r->print(''. - ''."\n"); - foreach ('avetries','difficulty','disc') { - $r->print(''. - ''."\n"); + &Apache::lonhtmlcommon::start_pick_box()); + $r->print(&Apache::lonhtmlcommon::row_title($lt{'stdno'}) + .&prettyprint('stdno',$dynmeta{'stdno'}) + .&Apache::lonhtmlcommon::row_closure() + ); + my @stats = ('avetries','difficulty','disc'); + my $rownum = 0; + foreach my $item (@stats) { + my $lastrow = ''; + $rownum ++; + $lastrow = 1 if ($rownum == @stats); + $r->print(&Apache::lonhtmlcommon::row_title($lt{$item}) + .&prettyprint($item,sprintf('%5.2f',$dynmeta{$item})) + .&Apache::lonhtmlcommon::row_closure($lastrow) + ); } - $r->print('
'.$lt{'stdno'}.''. - &prettyprint('stdno',$dynmeta{'stdno'}). - '
'.$lt{$_}.''. - &prettyprint($_,sprintf('%5.2f',$dynmeta{$_})). - '
'); + $r->print(&Apache::lonhtmlcommon::end_pick_box()); } if (exists($dynmeta{'stats'})) { # # New assessment statistics $r->print('

'. - &mt('Detailed Assessment Statistical Data'). + &mt('Recent Detailed Assessment Statistical Data'). '

'); - my $table = ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''.$/; + my $table=&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'' + .'' + .'' + .'' + .'' + .'' + .'' + .&Apache::loncommon::end_data_table_header_row().$/; foreach my $identifier (sort(keys(%{$dynmeta{'stats'}}))) { my $data = $dynmeta{'stats'}->{$identifier}; my $course = $data->{'course'}; @@ -1007,33 +1065,32 @@ sub print_dynamic_metadata { &Apache::lonnet::logthis('lookup for '.$course.' failed'); next; } - $table .= ''; + $table .= &Apache::loncommon::start_data_table_row(); $table .= - ''; + ''; $table .= ''; $table .= ''; - foreach ('avetries','difficulty','disc') { + foreach my $item ('avetries','difficulty','disc') { $table .= ''; } $table .= - ''; - $table .= - ''.$/; + ''; + $table .= &Apache::loncommon::end_data_table_row().$/; } - $table .= '
CourseSection(s)Num StudentsMean TriesDegree of DifficultyDegree of DiscriminationTime of computation
'.&mt('Course').''.&mt('Section(s)').''.&mt('Num Student').'s'.&mt('Mean Tries').''.&mt('Degree of Difficulty').''.&mt('Degree of Discrimination').''.&mt('Time of computation').'
'.$courseinfo{'description'}.''.$courseinfo{'description'}.''.$data->{'sections'}.''.$data->{'stdno'}.''; - if (exists($data->{$_})) { - $table .= sprintf('%.2f',$data->{$_}).' '; + if (exists($data->{$item})) { + $table .= sprintf('%.2f',$data->{$item}).' '; } else { $table .= ''; } $table .= ''. + ''. &Apache::lonlocal::locallocaltime($data->{'timestamp'}). - '
'.$/; + $table .= &Apache::loncommon::end_data_table().$/; $r->print($table); } else { - $r->print('No new dynamic data found.'); + $r->print(&mt('No new dynamic data found.')); } } else { $r->print('

'. @@ -1049,13 +1106,19 @@ sub print_dynamic_metadata { exists($dynmeta{'correct'}) || exists($dynmeta{'technical'})){ $r->print('

'.&mt('Evaluation Data').'

'. - ''); - foreach ('clear','depth','helpful','correct','technical') { - $r->print(''. - '\n"); + &Apache::lonhtmlcommon::start_pick_box()); + my @criteria = ('clear','depth','helpful','correct','technical'); + my $rownum = 0; + foreach my $item (@criteria) { + my $lastrow = ''; + $rownum ++; + $lastrow = 1 if ($rownum == @criteria); + $r->print(&Apache::lonhtmlcommon::row_title($lt{$item}) + .&prettyprint($item,$dynmeta{$item}) + .&Apache::lonhtmlcommon::row_closure($lastrow) + ); } - $r->print('
'.$lt{$_}.''. - &prettyprint($_,$dynmeta{$_})."
'); + $r->print(&Apache::lonhtmlcommon::end_pick_box()); } else { $r->print('

'.&mt('No Evaluation Data is available for this resource.').'

'); } @@ -1083,32 +1146,44 @@ sub print_dynamic_metadata { # All other stuff $r->print('

'. &mt('Additional Metadata (non-standard, parameters, exports)'). - '

'); - foreach (sort(keys(%content))) { - my $name=$_; - if ($name!~/\.display$/) { + ''); + $r->print(&Apache::lonhtmlcommon::start_pick_box()); + my @names; + foreach my $key (sort(keys(%content))) { + if ($key!~/\.display$/) { + push(@names,$key); + } + } + if (@names > 0) { + my $rownum = 0; + foreach my $name (@names) { + my $lastrow = ''; + $rownum ++; + $lastrow = 1 if ($rownum == @names); + my $display=&Apache::lonnet::metadata($uri, $name.'.display'); if (! $display) { $display=$name; }; my $otherinfo=''; - foreach ('name','part','type','default') { + foreach my $item ('name','part','type','default') { if (defined(&Apache::lonnet::metadata($uri, - $name.'.'.$_))) { - $otherinfo.=' '.$_.'='. + $name.'.'.$item))) { + $otherinfo.=' '.$item.'='. &Apache::lonnet::metadata($uri, - $name.'.'.$_).'; '; + $name.'.'.$item).'; '; } } - $r->print('\n"); + $r->print(&Apache::lonhtmlcommon::row_closure($lastrow)); } } - $r->print("
'.$display.''.$content{$name}); + $r->print(&Apache::lonhtmlcommon::row_title($display) + .$content{$name}); if ($otherinfo) { $r->print(' ('.$otherinfo.')'); } - $r->print("
"); + $r->print(&Apache::lonhtmlcommon::end_pick_box()); return; } @@ -1171,17 +1246,20 @@ ENDBOMBS ENDDEL } else { - $r->print(''.$goback.''); + $r->print('

'.$goback.'

'); + if ($env{'form.clearmsg'}) { + my ($diruri) = ($disuri =~ m{(.*/)[^/]*}); + $r->print('

'. + &mt('Back To Directory').'

'); + } } $r->print('
'.$bombs); } else { - my $displayfile='Catalog Information for '.$disuri; + my $displayfile=&mt('Catalog Information for [_1]',$disuri); if ($disuri=~/\/default$/) { my $dir=$disuri; $dir=~s/default$//; - $displayfile= - &mt('Default Cataloging Information for Directory').' '. - $dir; + $displayfile=&mt('Default Cataloging Information for Directory [_1]',$dir); } %Apache::lonpublisher::metadatafields=(); %Apache::lonpublisher::metadatakeys=(); @@ -1191,13 +1269,26 @@ ENDDEL } else { &Apache::lonpublisher::metaeval($result); } + if ($env{'form.new_courserestricted'}) { + my $new_assoc_course = $env{'form.new_courserestricted'}; + my $prev_courserestricted = $Apache::lonpublisher::metadatafields{'courserestricted'}; + if (($prev_courserestricted) && + ($prev_courserestricted ne $new_assoc_course)) { + my $transfers = []; + foreach my $key (keys(%env)) { + if ($key =~ /^form\.transfer_(.+)$/) { + push(@{$transfers},$1); + } + } + if (@{$transfers} > 0) { + &store_transferred_addedfields($fn,$uri,$transfers); + } + } + } $r->print(<$displayfile
ENDEDIT - $r->print(''); my %lt=&fieldnames($file_type); my $output; my @fields; @@ -1253,8 +1344,13 @@ ENDEDIT $Apache::lonpublisher::metadatafields{'owner'} = $env{'user.name'}.':'.$env{'user.domain'}; } - + if (! $Apache::lonpublisher::metadatafields{'author'}) { + $Apache::lonpublisher::metadatafields{'author'} = + &Apache::loncommon::plainname($env{'user.name'}, + $env{'user.domain'}); + } if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') { + if ($file_type eq 'portfolio') { $r->print(&mt('Associated with course [_1]', ''. @@ -1268,7 +1364,7 @@ ENDEDIT ".description"}.'').'
'); } } else { - $r->print('This resource is not associated with a course.
'); + $r->print(''.&mt('This resource is not associated with a course.').'
'); } } if (@added_order) { @@ -1286,8 +1382,15 @@ ENDEDIT my $row_alt = 1; 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)); + my @values = &Apache::loncommon::get_env_multiple('form.new_'.$field_name); + my $newvalue = ''; + foreach my $item (@values) { + if ($item ne '') { + $newvalue .= $item.','; + } + } + $newvalue =~ s/,$//; + $Apache::lonpublisher::metadatafields{$field_name}=$newvalue; } if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none' && exists($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'})) { @@ -1316,60 +1419,11 @@ ENDEDIT } $output .= &Apache::loncommon::end_data_table(); if ($env{'form.store'}) { - my $mfh; - my $formname='store'; - my $file_content; - if (&Apache::loncommon::get_env_multiple('form.new_keywords')) { - $Apache::lonpublisher::metadatafields{'keywords'} = - join (',', &Apache::loncommon::get_env_multiple('form.new_keywords')); - } - 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 my $key (split(/\,/, - $Apache::lonpublisher::metadatakeys{$unikey}) - ) { - my $value= - $Apache::lonpublisher::metadatafields{$unikey.'.'.$key}; - $value=~s/\"/\'\'/g; - $file_content.=' '.$key.'="'.$value.'"' ; - } - $file_content.= '>'. - &HTML::Entities::encode - ($Apache::lonpublisher::metadatafields{$unikey}, - '<>&"'). - ''; - } - if ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles|) { - my ($path, $new_fn); - if ($fn =~ m|$match_name/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,$uri)); - } else { - if (! ($mfh=Apache::File->new('>'.$fn))) { - $r->print('

'. - &mt('Could not write metadata').', '. - &mt('FAIL').'

'); - } else { - print $mfh ($file_content); - close($mfh); - &update_metadata_table($uri); - $r->print('

'.&mt('Wrote Metadata'). - ' '.&Apache::lonlocal::locallocaltime(time). - '

'); - } - } + my ($outcome,$result) = &store_metadata($fn,$uri,'store'); + $r->print($result); } $r->print($output.'
'); + &mt('Save Catalog Information').'" />'); if ($file_type eq 'portfolio' || $file_type eq 'groups') { my ($port_path,$group) = &get_port_path_and_group($uri); @@ -1391,40 +1445,126 @@ ENDEDIT return; } +sub store_metadata { + my ($fn,$uri,$caller) = @_; + my $mfh; + my $formname='store'; + my ($file_content,$output,$outcome); + if (&Apache::loncommon::get_env_multiple('form.new_keywords')) { + $Apache::lonpublisher::metadatafields{'keywords'} = + join (',', &Apache::loncommon::get_env_multiple('form.new_keywords')); + } + 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 my $key (split(/\,/,$Apache::lonpublisher::metadatakeys{$unikey})) { + my $value = $Apache::lonpublisher::metadatafields{$unikey.'.'.$key}; + $value=~s/\"/\'\'/g; + $file_content.=' '.$key.'="'.$value.'"' ; + } + $file_content.= '>'. + &HTML::Entities::encode + ($Apache::lonpublisher::metadatafields{$unikey},'<>&"'). + ''; + } + if ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles|) { + my ($path, $new_fn); + if ($fn =~ m|$match_name/groups/\w+/portfolio/|) { + ($path, $new_fn) = ($fn =~ m|/(groups/\w+/portfolio.*)/([^/]*)$|); + } else { + ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|); + } + ($outcome,my $result) = + &store_portfolio_metadata($formname,$file_content, + $path,$new_fn,$uri,$caller); + $output .= $result; + } else { + if (! ($mfh=Apache::File->new('>'.$fn))) { + $output .= '

'; + if ($caller eq 'transfer') { + $output .= &mt('Could not transfer data in added fields to notes'); + } else { + $output .= &mt('Could not write metadata'); + } + $output .= ', '.&mt('FAIL').'

'; + $outcome = 'fail'; + } else { + print $mfh ($file_content); + close($mfh); + &update_metadata_table($uri); + $output .= '

'; + if ($caller eq 'transfer') { + $output .= &mt('Transferred data in added fields to notes'); + } else { + $output .= &mt('Wrote Metadata'); + } + $output .= ' '.&Apache::lonlocal::locallocaltime(time). + '

'; + $outcome = 'ok'; + } + } + return ($outcome,$output); +} + +sub store_transferred_addedfields { + my ($fn,$uri,$transfers) = @_; + foreach my $item (@{$transfers}) { + $Apache::lonpublisher::metadatafields{'notes'} .= + ' '.$item.' = '.$Apache::lonpublisher::metadatafields{$item}; + } + my ($outcome,$output) = &store_metadata($fn,$uri,'transfer'); + if ($outcome eq 'ok') { + foreach my $item (@{$transfers}) { + delete($Apache::lonpublisher::metadatafields{$item}); + } + } +} + sub store_portfolio_metadata { - my ($formname,$content,$path,$new_fn,$uri) = @_; + my ($formname,$content,$path,$new_fn,$uri,$caller) = @_; + my ($outcome,$output); $env{'form.'.$formname}=$content."\n"; $env{'form.'.$formname.'.filename'}=$new_fn; my $result =&Apache::lonnet::userfileupload($formname,'',$path); if ($result =~ /(error|notfound)/) { - return '

'. - &mt('Could not write metadata').', '. - &mt('FAIL').'

'; + $output = '

'; + if ($caller eq 'transfer') { + $output .= + &mt('Could not transfer data in added fields to notes'); + } else { + $output .= &mt('Could not write metadata'); + } + $output .= ', '.&mt('FAIL').'

'; + $outcome = 'fail'; } else { &update_metadata_table($uri); - return '

'.&mt('Wrote Metadata'). - ' '.&Apache::lonlocal::locallocaltime(time).'

'; + $output = '

'; + if ($caller eq 'transfer') { + $output .= &mt('Transferred data in added fields to notes'); + } else { + $output .= &mt('Wrote Metadata'); + } + $output .= ' '.&Apache::lonlocal::locallocaltime(time). + '

'; + $outcome = 'ok'; } + return ($outcome,$output); } sub update_metadata_table { my ($uri) = @_; - my ($group,$file_name); - my ($udom,$uname,$remainder) = - ($uri=~m -^/+(?:uploaded|editupload)/+($match_domain)/+($match_name)/+(.*)$-); - - if ($remainder =~ /^groups\/(\w+)\/portfolio(\/.+)$/) { - $group = $1; - $file_name = $2; - } elsif ($remainder =~ /^portfolio(\/.+)$/) { - $file_name = $1; - } + my ($type,$udom,$uname,$file_name,$group) = + &Apache::lonnet::parse_portfolio_url($uri); $file_name =~ s/\.meta$//; my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,$uname); my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group, - $group.$file_name); + $file_name); my $access_hash = $access_controls{$file_name}; my $available = 0; if (ref($access_hash) eq 'HASH') { 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.