--- loncom/interface/lonmeta.pm 2007/01/18 23:20:56 1.195.2.1 +++ loncom/interface/lonmeta.pm 2013/06/04 23:12:08 1.251 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.195.2.1 2007/01/18 23:20:56 albertel Exp $ +# $Id: lonmeta.pm,v 1.251 2013/06/04 23:12:08 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,24 +42,6 @@ use Apache::lonmsg; use LONCAPA qw(:DEFAULT :match); -############################################################ -############################################################ -## -## &get_dynamic_metadata_from_sql($url) -## -## Queries sql database for dynamic metdata -## Returns a hash of hashes, with keys of urls which match $url -## Returned fields are given below. -## -## Examples: -## -## %DynamicMetadata = &Apache::lonmeta::get_dynmaic_metadata_from_sql -## ('/res/msu/korte/'); -## -## $DynamicMetadata{'/res/msu/korte/example.problem'}->{$field} -## -############################################################ -############################################################ sub get_dynamic_metadata_from_sql { my ($url) = shift(); my ($authordom,$author)=($url=~m{^/res/($match_domain)/($match_username)/}); @@ -182,7 +164,7 @@ sub evalgraph { my $val=int($value*10.+0.5)-10; my $output=''; if ($val>=20) { - $output.=''; + $output.=''; } else { $output.=''. ''; @@ -192,7 +174,7 @@ sub evalgraph { $output.=''. ''; } else { - $output.=''; + $output.=''; } $output.='
  '.(' ' x2).'      '.(' ' x2).' ('.sprintf("%5.2f",$value).')
'; return $output; @@ -265,7 +247,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', @@ -356,7 +338,7 @@ sub pre_select_course { &Apache::lonpublisher::metaeval($result); } $r->print('
'); - $r->print('

'.&mt('If you would like to associate this resource ([_1]) with a current or previous course, please select one from the list below, otherwise select, \'None\'',''.$res_uri.'').'

'); + $r->print('

'.&mt('If you would like to associate this resource ([_1]) with a current or previous course, please select one from the list below, otherwise select, "None".',''.$res_uri.'').'

'); $output = &select_course(); $r->print($output.'
'); @@ -369,7 +351,7 @@ sub pre_select_course { if ($group) { $group_input = ''; } - $r->print('

'. + $r->print(' '. ''. $group_input. ''. @@ -443,14 +425,14 @@ sub select_course { # Pretty printing of metadata field sub prettyprint { - my ($type,$value,$target,$prefix,$form,$noformat)=@_; + my ($type,$value,$target,$prefix,$form)=@_; # $target,$prefix,$form are optional and for filecrumbs only if (! defined($value)) { return ' '; } # Title if ($type eq 'title') { - return ''.$value.''; + return $value; } # Dates if (($type eq 'creationdate') || @@ -500,7 +482,7 @@ sub prettyprint { ($type eq 'comefrom_list') || ($type eq 'sequsage_list') || ($type eq 'dependencies')) { - return ''; } # Evaluations if (($type eq 'clear') || @@ -537,7 +519,7 @@ sub prettyprint { # List of courses if ($type=~/\_list/) { my @Courses = split(/\s*\,\s*/,$value); - my $Str=''; } # No pretty print found return $value; @@ -573,12 +555,13 @@ sub selectbox { $functionref=\&direct; } my $selout=''; } @@ -595,7 +578,7 @@ sub relatedfield { return $relatedsep.' '; } return $relatedsep.''; + ($relatedvalue?' checked="checked"':'').' />'; } sub prettyinput { @@ -631,9 +614,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; } @@ -645,9 +635,10 @@ sub prettyinput { || ($type eq 'author')||($type eq 'notes') || ($type eq 'abstract')|| ($type eq 'title')|| ($type eq 'standards') || (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)); + $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,\%meta_options)); } else { $output .= (&Apache::loncommon::multiple_select_form('new_'.$type,\@cur_values_inst,undef,\%meta_options)); } @@ -700,7 +691,7 @@ sub prettyinput { # Obsolete if ($type eq 'obsolete') { return ''. + ($value?' checked="checked"':'').' />'. &relatedfield(0,$relatedsearchflag,$relatedsep); } # Obsolete replacement file @@ -751,6 +742,23 @@ sub prettyinput { $relatedvalue); } +# Create pageheader +sub pageheader { + my $output = ''; + # No CSTR? Include breadcrumbs + if ($env{'request.state'} ne 'construct') { + # loncommon::bodytag already includes breadcrumbs for CSTR + # by calling lonmenu::innerregister + $output = &Apache::lonhtmlcommon::breadcrumbs(); + } + # CSTR? Include CSTR header + if ($env{'request.state'} eq 'construct') { + $output .= &Apache::loncommon::head_subbox( + &Apache::loncommon::CSTR_pageheader()); + } + return $output; +} + # Main Handler sub handler { my $r=shift; @@ -764,16 +772,37 @@ sub handler { return OK if $r->header_only; my ($resdomain,$resuser)= (&Apache::lonnet::declutter($uri)=~/^($match_domain)\/($match_username)\//); + + # Breadcrumbs + &Apache::lonhtmlcommon::clear_breadcrumbs(); + + if ($env{'request.state'} eq 'construct') { + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Authoring Space', + 'href' => &Apache::loncommon::authorspace($uri), + }); + } + if ($uri=~m:/adm/bombs/(.*)$:) { + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Error Messages', + 'href' => '', + }); $r->print(&Apache::loncommon::start_page('Error Messages')); + $r->print(&pageheader()); # Looking for all bombs? &report_bombs($r,$uri); } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) { + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Edit Portfolio File Metadata', + 'href' => '', + }); ($resdomain,$resuser)= (&Apache::lonnet::declutter($uri)=~m|^($match_domain)/($match_name)/portfolio|); - $r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information', + $r->print(&Apache::loncommon::start_page('Edit Portfolio File Metadata', undef, {'domain' => $resdomain,})); + $r->print(&pageheader()); if ($env{'form.store'}) { &present_editable_metadata($r,$uri,'portfolio'); } else { @@ -782,7 +811,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); @@ -791,20 +819,41 @@ sub handler { } } } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) { - $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information', + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Edit Group Portfolio File Metadata', + 'href' => '', + }); + $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Metadata', undef, {'domain' => $resdomain,})); + $r->print(&pageheader()); &present_editable_metadata($r,$uri,'groups'); - } elsif ($uri=~m|^/~|) { - # Construction space - $r->print(&Apache::loncommon::start_page('Edit Catalog nformation', - undef, + } elsif ($uri=~m|^/priv|) { + # Authoring space + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Edit Metadata', + 'href' => '', + }); + $r->print(&Apache::loncommon::start_page('Edit Metadata', + "\n".'', {'domain' => $resdomain,})); + $r->print(&pageheader()); &present_editable_metadata($r,$uri); } else { - $r->print(&Apache::loncommon::start_page('Catalog Information', - undef, - {'domain' => $resdomain,})); + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Metadata', + 'href' => '', + }); + $r->print( + &Apache::loncommon::start_page( + 'Metadata', + undef, + {'domain' => $resdomain, + 'only_body' => 1,}) + .'

'.&mt('Metadata').'

' + ); &present_uneditable_metadata($r,$uri); } $r->print(&Apache::loncommon::end_page()); @@ -823,30 +872,67 @@ sub report_bombs { # Set document type $uri =~ s:/adm/bombs/::; $uri = &Apache::lonnet::declutter($uri); - $r->print('

'.&Apache::lonnet::clutter($uri).'

'); + $r->print( + '

'.&mt('Folder: [_1]', + ''.&Apache::lonnet::clutter($uri).'') + .'

' + ); my ($domain,$author)=($uri=~/^($match_domain)\/($match_username)\//); - if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) { - if ($env{'form.clearbombs'}) { - &Apache::lonmsg::clear_author_res_msg($uri); - } - my $clear=&mt('Clear all Messages in Subdirectory'); - $r->print(< - - -ENDCLEAR + if (!&Apache::lonnet::constructaccess('/priv/'.$domain.'/'.$author.'/')) { + $r->print('

'.&mt('Not authorized').'

'); + return; + } + + my $showbuttons=1; + my $message=''; + if ($env{'form.clearbombs'}) { + my $rc=&Apache::lonmsg::clear_author_res_msg($uri); + if ($rc eq 'ok') { + $message=&Apache::lonhtmlcommon::confirm_success( + &mt('Messages cleared.')); + $showbuttons=0; + } else { + $message=&Apache::lonhtmlcommon::confirm_success( + &mt('Error clearing messages'),1) + .'
'.&mt('Error: [_1]',$rc); + } + } + + if ($message) { + $message=&Apache::loncommon::confirmwrapper($message); + $r->print($message); + } + + my $cancelurl=$uri; + $cancelurl=~s/^\Q$domain\E/\/priv\/$domain/; + + if ($showbuttons) { + $r->print( + '
'. + ''. + ' '. + &mt('Back to Source Directory').''. + '
' + ); + # Display all bombs of subdirectory 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). '
'); } } } else { - $r->print(&mt('Not authorized')); + my $functions=&Apache::lonhtmlcommon::start_funclist('Actions'); + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + ''. + &mt('Back to Source Directory').''); + $functions .= &Apache::lonhtmlcommon::end_funclist(); + $r->print('

'.$functions.'

'); } return; } @@ -864,8 +950,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 @@ -883,26 +969,25 @@ sub present_uneditable_metadata { $currentversion : &mt('information not available')).')'; } else { - $versiondisplay='Version: '.$currentversion; + $versiondisplay=&mt('Version: [_1]',$currentversion); } } - # crumbify displayed URL uri target prefix form size - $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1'); - $disuri =~ s:
::g; + # crumbify displayed URL uri target prefix form + $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef); # obsolete 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(); my $table=''; my $title = $content{'title'}; if (! defined($title)) { - $title = 'Untitled Resource'; + $title = &mt('Untitled Resource'); } my @fields; if ($uploaded) { @@ -931,24 +1016,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); } @@ -969,29 +1057,36 @@ sub print_dynamic_metadata { my %dynmeta=&dynamicmeta($uri); # # General Access and Usage Statistics + $r->print('

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

'); if (exists($dynmeta{'count'}) || exists($dynmeta{'sequsage'}) || exists($dynmeta{'comefrom'}) || 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"); + $r->print(&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.').'

'); + $r->print('

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

' + ); } # # Assessment statistics - if ($uri=~/\.(problem|exam|quiz|assess|survey|form)$/) { + if ($uri=~/$LONCAPA::assess_re/) { if (exists($dynmeta{'stdno'}) || exists($dynmeta{'avetries'}) || exists($dynmeta{'difficulty'}) || @@ -1000,35 +1095,42 @@ sub print_dynamic_metadata { $r->print('

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

'. - ''); - $r->print(''. - ''."\n"); - foreach ('avetries','difficulty','disc') { - $r->print(''. - ''."\n"); - } - $r->print('
'.$lt{'stdno'}.''. - &prettyprint('stdno',$dynmeta{'stdno'}). - '
'.$lt{$_}.''. - &prettyprint($_,sprintf('%5.2f',$dynmeta{$_})). - '
'); - } + &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(&Apache::lonhtmlcommon::end_pick_box()); + } + # + # New assessment statistics + $r->print('

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

' + ); if (exists($dynmeta{'stats'})) { - # - # New assessment statistics - $r->print('

'. - &mt('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'}; @@ -1039,108 +1141,143 @@ 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') { + $table .= + ''; + 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 Students').''.&mt('Part').''.&mt('Mean Tries').''.&mt('Degree of Difficulty').''.&mt('Degree of Discrimination').''.&mt('Time of computation').'
'.$courseinfo{'description'}.''.$courseinfo{'description'}.''.$data->{'sections'}.''.$data->{'stdno'}.''.$data->{'part'}.''; - 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('

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

'); } - - # # + # Evaluation Data + $r->print('

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

'); if (exists($dynmeta{'clear'}) || exists($dynmeta{'depth'}) || exists($dynmeta{'helpful'}) || exists($dynmeta{'correct'}) || exists($dynmeta{'technical'})){ - $r->print('

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

'. - ''); - foreach ('clear','depth','helpful','correct','technical') { - $r->print(''. - '\n"); + $r->print(&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.').'

'); + $r->print('

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

' + ); } + # Evaluation Comments $uri=~/^\/res\/($match_domain)\/($match_username)\//; if ((($env{'user.domain'} eq $1) && ($env{'user.name'} eq $2)) || ($env{'user.role.ca./'.$1.'/'.$2})) { + $r->print('

'.&mt('Evaluation Comments').'

' + .'
(' + .&mt('visible to author and co-authors only') + .')
' + ); if (exists($dynmeta{'comments'})) { - $r->print('

'.&mt('Evaluation Comments').' ('. - &mt('visible to author and co-authors only'). - ')

'. - '
'.$dynmeta{'comments'}.'
'); + $r->print('
'.$dynmeta{'comments'}.'
'); } else { - $r->print('

'.&mt('There are no Evaluation Comments on this resource.').'

'); + $r->print('

' + .&mt('There are no Evaluation Comments on this resource.') + .'

' + ); } my $bombs = &Apache::lonmsg::retrieve_author_res_msg($uri); if (defined($bombs) && $bombs ne '') { - $r->print('

'.&mt('Error Messages').' ('. - &mt('visible to author and co-authors only').')'. - '

'.$bombs); - } else { - $r->print('

'.&mt('There are currently no Error Messages for this resource.').'

'); - } + $r->print('' + .'

'.&mt('Error Messages').'

' + .'
(' + .&mt('visible to author and co-authors only') + .')
' + .$bombs + ); + } #else { + # $r->print('

'.&mt('There are currently no Error Messages for this resource.').'

'); + #} } # # 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; } @@ -1155,7 +1292,7 @@ sub print_dynamic_metadata { ##################################################### sub present_editable_metadata { my ($r,$uri,$file_type) = @_; - # Construction Space Call + # Authoring Space Call # Header my $disuri=$uri; my $fn=&Apache::lonnet::filelocation('',$uri); @@ -1171,55 +1308,89 @@ sub present_editable_metadata { $target=~s/\.meta$//; my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target); if ($bombs) { - my $showdel=1; + # Display Bombs, not Metadata + $r->print( + '

'.&mt('Error Messages').'

' + .'

'.&mt('Folder: [_1]', + ''.$disuri.'') + .'

' + ); + my $showbuttons=1; + my $message=''; + my $rc=''; if ($env{'form.delmsg'}) { - if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') { - $bombs=&mt('Messages deleted.'); - $showdel=0; + $rc=&Apache::lonmsg::del_url_author_res_msg($target); + if ($rc eq 'ok') { + $message=&Apache::lonhtmlcommon::confirm_success( + &mt('Messages deleted.')); + $showbuttons=0; } else { - $bombs=&mt('Error deleting messages'); + $message=&Apache::lonhtmlcommon::confirm_success( + &mt('Error deleting messages'), 1) + .'
'.&mt('Error: [_1]',$rc); } } if ($env{'form.clearmsg'}) { my $cleardir=$target; - $cleardir=~s/\/[^\/]+$/\//; - if (&Apache::lonmsg::clear_author_res_msg($cleardir) eq 'ok') { - $bombs=&mt('Messages cleared.'); - $showdel=0; + $cleardir=~s/\/[^\/]+$/\//; # Extract dir: keep path, remove filename + $rc=&Apache::lonmsg::clear_author_res_msg($cleardir); + if ($rc eq 'ok') { + $message=&Apache::lonhtmlcommon::confirm_success( + &mt('Messages cleared.')); + $showbuttons=0; } else { - $bombs=&mt('Error clearing messages'); - } - } - my $del=&mt('Delete Messages for this Resource'); - my $clear=&mt('Clear all Messages in Subdirectory'); - my $goback=&mt('Back to Source File'); - $r->print(<$disuri -
-ENDBOMBS - if ($showdel) { - $r->print(< - -ENDDEL + $message=&Apache::lonhtmlcommon::confirm_success( + &mt('Error clearing messages'),1) + .'
'.&mt('Error: [_1]',$rc); + } + } + if ($message) { + $message=&Apache::loncommon::confirmwrapper($message); + $r->print($message); + } + + $r->print(''); + if ($showbuttons) { + $r->print( + ''. + '' + .'
'.$bombs + ); } else { - $r->print(''.$goback.''); - } - $r->print('
'.$bombs); + my $functions=&Apache::lonhtmlcommon::start_funclist('Actions'); + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + ''. + &mt('Back to Source File').''); + my ($diruri) = ($disuri =~ m{(.*/)[^/]*}); + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + ''. + &mt('Back to Source Directory').''); + $functions .= &Apache::lonhtmlcommon::end_funclist(); + $r->print('

'.$functions.'

'); + } } else { - my $displayfile='Catalog Information for '.$disuri; + + # Display Metadata, not Bombs + my $displayfile = + &mt('Metadata for [_1]' + ,''.$disuri.''); if ($disuri=~/\/default$/) { my $dir=$disuri; $dir=~s/default$//; - $displayfile= - &mt('Default Cataloging Information for Directory').' '. - $dir; + $displayfile=&mt('Default Metadata for Directory [_1]' + ,''.$dir.''); } %Apache::lonpublisher::metadatafields=(); %Apache::lonpublisher::metadatakeys=(); my $result=&Apache::lonnet::getfile($fn); if ($result == -1){ - $r->print(&mt('Creating new file [_1]'),$meta_uri); + my $message = &Apache::lonhtmlcommon::confirm_success( + &mt('Creating new file [_1]' + ,'')); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } else { &Apache::lonpublisher::metaeval($result); } @@ -1240,12 +1411,9 @@ ENDDEL } } $r->print(<$displayfile +

$displayfile

ENDEDIT - $r->print(''); my %lt=&fieldnames($file_type); my $output; my @fields; @@ -1269,7 +1437,7 @@ ENDEDIT @fields = (split(/,/,$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'})); } else { # no saved field list, use default list - @fields = ('author','title','subject','keywords','abstract', + @fields = ('title','author','subject','keywords','abstract', 'notes','lowestgradelevel', 'highestgradelevel','standards'); if ($Apache::lonpublisher::metadatafields{'courserestricted'} =~ /^course\.($match_domain\_$match_courseid)$/) { @@ -1282,7 +1450,7 @@ ENDEDIT } } } else { - @fields = ('author','title','subject','keywords','abstract','notes', + @fields = ('title','author','subject','keywords','abstract','notes', 'copyright','customdistributionfile','language', 'standards', 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights', @@ -1301,24 +1469,37 @@ 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]', - ''. - $env{$Apache::lonpublisher::metadatafields{'courserestricted'}. - ".description"}. - '').'
'); + $r->print( + &mt('Associated with course [_1]' + ,'' + .$env{$Apache::lonpublisher::metadatafields{'courserestricted'} + .".description"}.'') + .' ' + .&mt('Change') + .''.'
' + ); + } else { $r->print(&mt('Associated with course [_1]', ''. $env{$Apache::lonpublisher::metadatafields{'courserestricted'}. ".description"}.'').'
'); } - } else { - $r->print('This resource is not associated with a course.
'); - } - } + } else { + $r->print( + &mt('This resource is not associated with a course.') + .' '.&mt('Change').'
' + ); + } + } if (@added_order) { foreach my $field_name (@added_order) { push(@fields,$field_name); @@ -1330,12 +1511,21 @@ ENDEDIT $lt{$field_name} = $$added_metadata_fields{$field_name}; } } - $output .= &Apache::loncommon::start_data_table(); - my $row_alt = 1; + $output .= &Apache::lonhtmlcommon::start_pick_box(); + my $last = $#fields + 1; + my $rowcount = 0; foreach my $field_name (@fields) { + $rowcount++; 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'})) { @@ -1344,31 +1534,32 @@ ENDEDIT ($field_name eq 'courserestricted'))&& (!($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/))){ - $output .= "\n".&Apache::loncommon::start_data_table_row(); - $output .= (''.$lt{$field_name}.': '. - &prettyinput($field_name, + $output .= &Apache::lonhtmlcommon::row_title($lt{$field_name}) + .&prettyinput($field_name, $Apache::lonpublisher::metadatafields{$field_name}, 'new_'.$field_name,'defaultmeta', undef,undef,undef,undef, - $Apache::lonpublisher::metadatafields{'courserestricted'}).''); - $output .= &Apache::loncommon::end_data_table_row(); + $Apache::lonpublisher::metadatafields{'courserestricted'}); + $output .= &Apache::lonhtmlcommon::row_closure($rowcount == $last?1:0); } } else { - $output.=(&Apache::loncommon::start_data_table_row().''.$lt{$field_name}.': '. - &prettyinput($field_name, + $output .= &Apache::lonhtmlcommon::row_title($lt{$field_name}) + .&prettyinput($field_name, $Apache::lonpublisher::metadatafields{$field_name}, - 'new_'.$field_name,'defaultmeta').''.&Apache::loncommon::end_data_table_row()); + 'new_'.$field_name,'defaultmeta') + .&Apache::lonhtmlcommon::row_closure($rowcount == $last?1:0); } } - $output .= &Apache::loncommon::end_data_table(); + $output .= &Apache::lonhtmlcommon::end_pick_box(); if ($env{'form.store'}) { my ($outcome,$result) = &store_metadata($fn,$uri,'store'); $r->print($result); } - $r->print($output.'
'); + my $savebutton = '

'; + $r->print($savebutton.$output.$savebutton); if ($file_type eq 'portfolio' || $file_type eq 'groups') { my ($port_path,$group) = &get_port_path_and_group($uri); @@ -1429,26 +1620,27 @@ sub store_metadata { $output .= $result; } else { if (! ($mfh=Apache::File->new('>'.$fn))) { - $output .= '

'; + $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').'

'; + $output .= ', '.&mt('FAIL').'

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

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

'; + $output .= &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + $confirmtext.' '.&Apache::lonlocal::locallocaltime(time))); $outcome = 'ok'; } } @@ -1476,25 +1668,25 @@ sub store_portfolio_metadata { $env{'form.'.$formname.'.filename'}=$new_fn; my $result =&Apache::lonnet::userfileupload($formname,'',$path); if ($result =~ /(error|notfound)/) { - $output = '

'; + $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').'

'; + $output .= ', '.&mt('FAIL').'

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

'; + $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); @@ -1502,22 +1694,14 @@ sub store_portfolio_metadata { 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') { @@ -1541,3 +1725,95 @@ sub update_metadata_table { 1; __END__ + +=head1 NAME + +Apache::lonmeta - display meta data + +=head1 SYNOPSIS + +Handler to display meta data + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 SUBROUTINES + +=over + +=item &get_dynamic_metadata_from_sql($url) : + +Queries sql database for dynamic metdata +Returns a hash of hashes, with keys of urls which match $url +Returned fields are given below. + +Examples: + + %DynamicMetadata = &Apache::lonmeta::get_dynmaic_metadata_from_sql + ('/res/msu/korte/'); + + $DynamicMetadata{'/res/msu/korte/example.problem'}->{$field} + +=item dynamicmeta() + +Fetch and evaluate dynamic metadata + +=item access_count() + +=item alttag() + +Try to make an alt tag if there is none + +=item authordisplay() + +Author display + +=item evalgraph() + +Pretty display + +=item diffgraph() + +=item fieldnames() + +=item portfolio_linked_path() + +=item get_port_path_and_group() + +=item portfolio_display_uri() + +=item pre_select_course() + +=item select_course() + +=item prettyprint() + +Pretty printing of metadata field + +=item direct() + +Pretty input of metadata field + +=item selectbox() + +=item relatedfield() + +=item prettyinput() + +=item report_bombs() + +=item present_uneditable_metadata() + +=item present_editable_metadata() + +=item store_metadata() + +=item store_transferred_addedfields() + +=item store_portfolio_metadata() + +=item update_metadata_table() + +=back + +=cut 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.