--- loncom/interface/lonmeta.pm 2008/12/17 18:47:08 1.212.2.4
+++ loncom/interface/lonmeta.pm 2008/11/18 19:14:22 1.215
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.212.2.4 2008/12/17 18:47:08 raeburn Exp $
+# $Id: lonmeta.pm,v 1.215 2008/11/18 19:14:22 jms Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,6 +26,99 @@
# http://www.lon-capa.org/
+=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
+
+
package Apache::lonmeta;
use strict;
@@ -42,24 +135,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 +257,7 @@ sub evalgraph {
my $val=int($value*10.+0.5)-10;
my $output='<table border="0" cellpadding="0" cellspacing="0"><tr>';
if ($val>=20) {
- $output.='<td width="20" bgcolor="#555555">'.(' ' x2).'</td>';
+ $output.='<td width="20" bgcolor="#555555">  </td>';
} else {
$output.='<td width="'.($val).'" bgcolor="#555555"> </td>'.
'<td width="'.(20-$val).'" bgcolor="#FF3333"> </td>';
@@ -192,7 +267,7 @@ sub evalgraph {
$output.='<td width="'.($val-20).'" bgcolor="#33FF33"> </td>'.
'<td width="'.(40-$val).'" bgcolor="#555555"> </td>';
} else {
- $output.='<td width="20" bgcolor="#555555">'.(' ' x2).'</td>';
+ $output.='<td width="20" bgcolor="#555555">  </td>';
}
$output.='<td> ('.sprintf("%5.2f",$value).') </td></tr></table>';
return $output;
@@ -573,13 +648,12 @@ sub selectbox {
$functionref=\&direct;
}
my $selout='<select name="'.$name.'">';
- foreach my $id (@idlist) {
- $selout.='<option value="'.$id.'"';
- if ($id eq $value) {
+ foreach (@idlist) {
+ $selout.='<option value=\''.$_.'\'';
+ if ($_ eq $value) {
$selout.=' selected>'.&{$functionref}($_).'</option>';
- } else {
- $selout.='>'.&{$functionref}($id).'</option>';
- }
+ }
+ else {$selout.='>'.&{$functionref}($_).'</option>';}
}
return $selout.'</select>';
}
@@ -812,7 +886,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);
@@ -851,11 +925,11 @@ sub report_bombs {
ENDCLEAR
my %brokenurls =
&Apache::lonmsg::all_url_author_res_msg($author,$domain);
- foreach my $key (sort(keys(%brokenurls))) {
- if ($key=~/^\Q$uri\E/) {
+ foreach (sort(keys(%brokenurls))) {
+ if ($_=~/^\Q$uri\E/) {
$r->print
- ('<a href="'.&Apache::lonnet::clutter($key).'">'.$key.'</a>'.
- &Apache::lonmsg::retrieve_author_res_msg($key).
+ ('<a href="'.&Apache::lonnet::clutter($_).'">'.$_.'</a>'.
+ &Apache::lonmsg::retrieve_author_res_msg($_).
'<hr />');
}
}
@@ -878,8 +952,8 @@ sub present_uneditable_metadata {
my $uploaded = ($uri =~ m|/uploaded/|);
my %content=();
# Read file
- foreach my $key (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
- $content{$key}=&Apache::lonnet::metadata($uri,$key);
+ foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
+ $content{$_}=&Apache::lonnet::metadata($uri,$_);
}
# Render Output
# displayed url
@@ -907,9 +981,9 @@ sub present_uneditable_metadata {
my $obsolete=$content{'obsolete'};
my $obsoletewarning='';
if (($obsolete) && ($env{'user.adv'})) {
- $obsoletewarning='<p><span class="LC_warning">'.
+ $obsoletewarning='<p><font color="red">'.
&mt('This resource has been marked obsolete by the author(s)').
- '</span></p>';
+ '</font></p>';
}
#
my %lt=&fieldnames();
@@ -945,27 +1019,24 @@ sub present_uneditable_metadata {
'obsolete',
'obsoletereplacement');
}
- my $rownum = 0;
foreach my $field (@fields) {
- my $lastrow = '';
- $rownum ++;
- $lastrow = 1 if ($rownum == @fields);
- $table.=&Apache::lonhtmlcommon::row_title($lt{$field})
- .&prettyprint($field,$content{$field})
- .&Apache::lonhtmlcommon::row_closure($lastrow);
+ $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$field}.
+ '</td><td bgcolor="#CCCCCC">'.
+ &prettyprint($field,$content{$field}).'</td></tr>';
delete($content{$field});
}
#
- $r->print("<h2>$title</h2>"
- .'<p>'
- .$disuri.'<br />'
- .$obsoletewarning
- .$versiondisplay
- .'</p>'
- .&Apache::lonhtmlcommon::start_pick_box()
- .$table
- .&Apache::lonhtmlcommon::end_pick_box()
- );
+ $r->print(<<ENDHEAD);
+<h2>$title</h2>
+<p>
+$disuri<br />
+$obsoletewarning
+$versiondisplay
+</p>
+<table cellspacing="2" border="0">
+$table
+</table>
+ENDHEAD
if (!$uploaded && $env{'user.adv'}) {
&print_dynamic_metadata($r,$uri,\%content);
}
@@ -992,21 +1063,17 @@ sub print_dynamic_metadata {
exists($dynmeta{'goto'}) ||
exists($dynmeta{'course'})) {
$r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>'.
- &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)
- );
+ '<table cellspacing="2" border="0">');
+ foreach ('count',
+ 'sequsage','sequsage_list',
+ 'comefrom','comefrom_list',
+ 'goto','goto_list',
+ 'course','course_list') {
+ $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
+ '<td bgcolor="#CCCCCC">'.
+ &prettyprint($_,$dynmeta{$_})."</td></tr>\n");
}
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print('</table>');
} else {
$r->print('<h4>'.&mt('No Access or Usages Statistics are available for this resource.').'</h4>');
}
@@ -1021,23 +1088,18 @@ sub print_dynamic_metadata {
$r->print('<h4>'.
&mt('Overall Assessment Statistical Data').
'</h4>'.
- &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)
- );
+ '<table cellspacing="2" border="0">');
+ $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{'stdno'}.'</td>'.
+ '<td bgcolor="#CCCCCC">'.
+ &prettyprint('stdno',$dynmeta{'stdno'}).
+ '</td>'."</tr>\n");
+ foreach ('avetries','difficulty','disc') {
+ $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
+ '<td bgcolor="#CCCCCC">'.
+ &prettyprint($_,sprintf('%5.2f',$dynmeta{$_})).
+ '</td>'."</tr>\n");
}
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print('</table>');
}
if (exists($dynmeta{'stats'})) {
#
@@ -1045,16 +1107,16 @@ sub print_dynamic_metadata {
$r->print('<h4>'.
&mt('Recent Detailed Assessment Statistical Data').
'</h4>');
- my $table=&Apache::loncommon::start_data_table()
- .&Apache::loncommon::start_data_table_header_row()
- .'<th>'.&mt('Course').'</th>'
- .'<th>'.&mt('Section(s)').'</th>'
- .'<th>'.&mt('Num Student').'s</th>'
- .'<th>'.&mt('Mean Tries').'</th>'
- .'<th>'.&mt('Degree of Difficulty').'</th>'
- .'<th>'.&mt('Degree of Discrimination').'</th>'
- .'<th>'.&mt('Time of computation').'</th>'
- .&Apache::loncommon::end_data_table_header_row().$/;
+ my $table = '<table cellspacing="2" border="0">'.
+ '<tr>'.
+ '<th>'.&mt('Course').'</th>'.
+ '<th>'.&mt('Section(s)').'</th>'.
+ '<th>'.&mt('Num Student').'s</th>'.
+ '<th>'.&mt('Mean Tries').'</th>'.
+ '<th>'.&mt('Degree of Difficulty').'</th>'.
+ '<th>'.&mt('Degree of Discrimination').'</th>'.
+ '<th>'.&mt('Time of computation').'</th>'.
+ '</tr>'.$/;
foreach my $identifier (sort(keys(%{$dynmeta{'stats'}}))) {
my $data = $dynmeta{'stats'}->{$identifier};
my $course = $data->{'course'};
@@ -1065,29 +1127,30 @@ sub print_dynamic_metadata {
&Apache::lonnet::logthis('lookup for '.$course.' failed');
next;
}
- $table .= &Apache::loncommon::start_data_table_row();
+ $table .= '<tr>';
$table .=
- '<td><span class="LC_nobreak">'.$courseinfo{'description'}.'</span></td>';
+ '<td><nobr>'.$courseinfo{'description'}.'</nobr></td>';
$table .=
'<td align="right">'.$data->{'sections'}.'</td>';
$table .=
'<td align="right">'.$data->{'stdno'}.'</td>';
- foreach my $item ('avetries','difficulty','disc') {
+ foreach ('avetries','difficulty','disc') {
$table .= '<td align="right">';
- if (exists($data->{$item})) {
- $table .= sprintf('%.2f',$data->{$item}).' ';
+ if (exists($data->{$_})) {
+ $table .= sprintf('%.2f',$data->{$_}).' ';
} else {
$table .= '';
}
$table .= '</td>';
}
$table .=
- '<td><span class="LC_nobreak">'.
+ '<td><nobr>'.
&Apache::lonlocal::locallocaltime($data->{'timestamp'}).
- '</span></td>';
- $table .= &Apache::loncommon::end_data_table_row().$/;
+ '</nobr></td>';
+ $table .=
+ '</tr>'.$/;
}
- $table .= &Apache::loncommon::end_data_table().$/;
+ $table .= '</table>'.$/;
$r->print($table);
} else {
$r->print(&mt('No new dynamic data found.'));
@@ -1106,19 +1169,13 @@ sub print_dynamic_metadata {
exists($dynmeta{'correct'}) ||
exists($dynmeta{'technical'})){
$r->print('<h4>'.&mt('Evaluation Data').'</h4>'.
- &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)
- );
+ '<table cellspacing="2" border="0">');
+ foreach ('clear','depth','helpful','correct','technical') {
+ $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
+ '<td bgcolor="#CCCCCC">'.
+ &prettyprint($_,$dynmeta{$_})."</td></tr>\n");
}
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print('</table>');
} else {
$r->print('<h4>'.&mt('No Evaluation Data is available for this resource.').'</h4>');
}
@@ -1146,44 +1203,32 @@ sub print_dynamic_metadata {
# All other stuff
$r->print('<h3>'.
&mt('Additional Metadata (non-standard, parameters, exports)').
- '</h3>');
- $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);
-
+ '</h3><table border="0" cellspacing="1">');
+ foreach (sort(keys(%content))) {
+ my $name=$_;
+ if ($name!~/\.display$/) {
my $display=&Apache::lonnet::metadata($uri,
$name.'.display');
if (! $display) {
$display=$name;
};
my $otherinfo='';
- foreach my $item ('name','part','type','default') {
+ foreach ('name','part','type','default') {
if (defined(&Apache::lonnet::metadata($uri,
- $name.'.'.$item))) {
- $otherinfo.=' '.$item.'='.
+ $name.'.'.$_))) {
+ $otherinfo.=' '.$_.'='.
&Apache::lonnet::metadata($uri,
- $name.'.'.$item).'; ';
+ $name.'.'.$_).'; ';
}
}
- $r->print(&Apache::lonhtmlcommon::row_title($display)
- .$content{$name});
+ $r->print('<tr><td bgcolor="#bbccbb"><font size="-1" color="#556655">'.$display.'</font></td><td bgcolor="#ccddcc"><font size="-1" color="#556655">'.$content{$name});
if ($otherinfo) {
$r->print(' ('.$otherinfo.')');
}
- $r->print(&Apache::lonhtmlcommon::row_closure($lastrow));
+ $r->print("</font></td></tr>\n");
}
}
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print("</table>");
return;
}
@@ -1255,11 +1300,11 @@ ENDDEL
}
$r->print('<br />'.$bombs);
} else {
- my $displayfile=&mt('Catalog Information for [_1]',$disuri);
+ my $displayfile=&mt('Metadata for [_1]',$disuri);
if ($disuri=~/\/default$/) {
my $dir=$disuri;
$dir=~s/default$//;
- $displayfile=&mt('Default Cataloging Information for Directory [_1]',$dir);
+ $displayfile=&mt('Default Metadata for Directory [_1]',$dir);
}
%Apache::lonpublisher::metadatafields=();
%Apache::lonpublisher::metadatakeys=();
@@ -1422,8 +1467,8 @@ ENDEDIT
my ($outcome,$result) = &store_metadata($fn,$uri,'store');
$r->print($result);
}
- $r->print($output.'<br /><input type="submit" name="store" value="'.
- &mt('Save Catalog Information').'" />');
+ $r->print($output.'<br /><input type="submit" title="Save Metadata" name="store" value="'.
+ &mt('Save').'" />');
if ($file_type eq 'portfolio' || $file_type eq 'groups') {
my ($port_path,$group) = &get_port_path_and_group($uri);