--- loncom/interface/lonmeta.pm 2007/05/15 20:21:17 1.208 +++ loncom/interface/lonmeta.pm 2008/12/13 19:44:52 1.220 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.208 2007/05/15 20:21:17 albertel Exp $ +# $Id: lonmeta.pm,v 1.220 2008/12/13 19:44:52 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.='
             ('.sprintf("%5.2f",$value).')
'; return $output; @@ -573,12 +555,13 @@ sub selectbox { $functionref=\&direct; } my $selout=''; } @@ -811,7 +794,7 @@ sub handler { {'domain' => $resdomain,})); &present_editable_metadata($r,$uri); } else { - $r->print(&Apache::loncommon::start_page('Catalog Information', + $r->print(&Apache::loncommon::start_page('Metadata', undef, {'domain' => $resdomain,})); &present_uneditable_metadata($r,$uri); @@ -839,18 +822,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). '
'); } } @@ -873,8 +860,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 @@ -902,9 +889,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(); @@ -941,23 +928,22 @@ sub present_uneditable_metadata { 'obsoletereplacement'); } foreach my $field (@fields) { - $table.=''.$lt{$field}. - ''. - &prettyprint($field,$content{$field}).''; + $table.=&Apache::lonhtmlcommon::row_title($lt{$field}) + .&prettyprint($field,$content{$field}) + .&Apache::lonhtmlcommon::row_closure(); 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); } @@ -984,17 +970,18 @@ 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()); + foreach my $item ('count', + 'sequsage','sequsage_list', + 'comefrom','comefrom_list', + 'goto','goto_list', + 'course','course_list') { + $r->print(&Apache::lonhtmlcommon::row_title($lt{$item}) + .&prettyprint($item,$dynmeta{$item}) + .&Apache::lonhtmlcommon::row_closure() + ); } - $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.').'

'); } @@ -1009,18 +996,18 @@ 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() + ); + foreach my $item ('avetries','difficulty','disc') { + $r->print(&Apache::lonhtmlcommon::row_title($lt{$item}) + .&prettyprint($item,sprintf('%5.2f',$dynmeta{$item})) + .&Apache::lonhtmlcommon::row_closure() + ); } - $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'})) { # @@ -1028,16 +1015,16 @@ sub print_dynamic_metadata { $r->print('

'. &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'}; @@ -1048,33 +1035,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 .= '
'.&mt('Course').''.&mt('Section(s)').''.&mt('Num Student').'s'.&mt('Mean Tries').''.&mt('Degree of Difficulty').''.&mt('Degree of Discrimination').''.&mt('Time of computation').'
'.&mt('Course').''.&mt('Section(s)').''.&mt('Num Students').''.&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('

'. @@ -1090,13 +1076,14 @@ 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()); + foreach my $item ('clear','depth','helpful','correct','technical') { + $r->print(&Apache::lonhtmlcommon::row_title($lt{$item}) + .&prettyprint($item,$dynmeta{$item}) + .&Apache::lonhtmlcommon::row_closure() + ); } - $r->print('
'.$lt{$_}.''. - &prettyprint($_,$dynmeta{$_})."
'); + $r->print(&Apache::lonhtmlcommon::end_pick_box()); } else { $r->print('

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

'); } @@ -1124,9 +1111,9 @@ sub print_dynamic_metadata { # All other stuff $r->print('

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

'); - foreach (sort(keys(%content))) { - my $name=$_; + ''); + $r->print(&Apache::lonhtmlcommon::start_pick_box()); + foreach my $name (sort(keys(%content))) { if ($name!~/\.display$/) { my $display=&Apache::lonnet::metadata($uri, $name.'.display'); @@ -1134,22 +1121,24 @@ sub print_dynamic_metadata { $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()); } } - $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; } @@ -1221,13 +1210,11 @@ ENDDEL } $r->print('
'.$bombs); } else { - my $displayfile='Catalog Information for '.$disuri; + 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=(); @@ -1312,6 +1299,11 @@ 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') { @@ -1327,7 +1319,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) { @@ -1385,8 +1377,8 @@ ENDEDIT my ($outcome,$result) = &store_metadata($fn,$uri,'store'); $r->print($result); } - $r->print($output.'
'); + $r->print($output.'
'); if ($file_type eq 'portfolio' || $file_type eq 'groups') { my ($port_path,$group) = &get_port_path_and_group($uri); @@ -1551,3 +1543,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