--- loncom/interface/lonmeta.pm 2006/12/05 02:55:53 1.190
+++ loncom/interface/lonmeta.pm 2008/12/13 22:15:53 1.223
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.190 2006/12/05 02:55:53 albertel Exp $
+# $Id: lonmeta.pm,v 1.223 2008/12/13 22:15:53 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='<table border="0" cellpadding="0" cellspacing="0"><tr>';
if ($val>=20) {
- $output.='<td width="20" bgcolor="#555555">  </td>';
+ $output.='<td width="20" bgcolor="#555555">'.(' ' x2).'</td>';
} else {
$output.='<td width="'.($val).'" bgcolor="#555555"> </td>'.
'<td width="'.(20-$val).'" bgcolor="#FF3333"> </td>';
@@ -192,7 +174,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">  </td>';
+ $output.='<td width="20" bgcolor="#555555">'.(' ' x2).'</td>';
}
$output.='<td> ('.sprintf("%5.2f",$value).') </td></tr></table>';
return $output;
@@ -235,7 +217,7 @@ sub fieldnames {
'lowestgradelevel' => 'Lowest Grade Level',
'highestgradelevel' => 'Highest Grade Level');
- if (! defined($file_type) || $file_type ne 'portfolio') {
+ if ( !defined($file_type) || ($file_type ne 'portfolio' && $file_type ne 'groups') ) {
%fields =
(%fields,
'domain' => 'Domain',
@@ -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',
@@ -383,7 +365,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().
+ '<td><input type="checkbox" name="transfer_'.
+ $field_name.'" value="1" /></td><td>'.
+ $field_name.'</td><td>'.$value.'</td>'.
+ &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).'<br />'."\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.').'<br /><br />'.
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th>Copy to notes?</th>'."\n".
+ '<th>Field name</th>'."\n".
+ '<th>Values</th>'."\n".
+ &Apache::loncommon::end_data_table_header_row().
+ $transfernotes.
+ &Apache::loncommon::end_data_table().'<br />';
+ }
+ }
+ }
+ }
$output .= '<select name="new_courserestricted" >';
$output .= '<option value="none" '.$selected.'>'.
&mt('None').'</option>'.$/;
@@ -540,12 +555,13 @@ sub selectbox {
$functionref=\&direct;
}
my $selout='<select name="'.$name.'">';
- foreach (@idlist) {
- $selout.='<option value=\''.$_.'\'';
- if ($_ eq $value) {
- $selout.=' selected>'.&{$functionref}($_).'</option>';
- }
- else {$selout.='>'.&{$functionref}($_).'</option>';}
+ foreach my $id (@idlist) {
+ $selout.='<option value="'.$id.'"';
+ if ($id eq $value) {
+ $selout.=' selected>'.&{$functionref}($id).'</option>';
+ } else {
+ $selout.='>'.&{$functionref}($id).'</option>';
+ }
}
return $selout.'</select>';
}
@@ -598,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;
}
@@ -608,11 +631,11 @@ sub prettyinput {
return (&select_course());
# return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
}
- 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 +773,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,12 +787,14 @@ 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".'<script type="text/javascript">'."\n".
+ &Apache::loncommon::browser_and_searcher_javascript().
+ "\n".'</script>',
{'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);
@@ -798,18 +822,22 @@ sub report_bombs {
&Apache::lonmsg::clear_author_res_msg($uri);
}
my $clear=&mt('Clear all Messages in Subdirectory');
- $r->print(<<ENDCLEAR);
+ my $cancel=&mt('Back to Directory');
+ my $cancelurl=$uri;
+ $cancelurl=~s/^\Q$domain\E/\/priv/;
+ $r->print(<<ENDCLEAR);
<form method="post">
<input type="submit" name="clearbombs" value="$clear" />
-</form>
+<a href="$cancelurl">$cancel</a>
+</form><hr />
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
- ('<a href="'.&Apache::lonnet::clutter($_).'">'.$_.'</a>'.
- &Apache::lonmsg::retrieve_author_res_msg($_).
+ ('<a href="'.&Apache::lonnet::clutter($key).'">'.$key.'</a>'.
+ &Apache::lonmsg::retrieve_author_res_msg($key).
'<hr />');
}
}
@@ -832,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
@@ -861,9 +889,9 @@ sub present_uneditable_metadata {
my $obsolete=$content{'obsolete'};
my $obsoletewarning='';
if (($obsolete) && ($env{'user.adv'})) {
- $obsoletewarning='<p><font color="red">'.
+ $obsoletewarning='<p><span class="LC_warning">'.
&mt('This resource has been marked obsolete by the author(s)').
- '</font></p>';
+ '</span></p>';
}
#
my %lt=&fieldnames();
@@ -899,24 +927,27 @@ sub present_uneditable_metadata {
'obsolete',
'obsoletereplacement');
}
+ my $rownum = 0;
foreach my $field (@fields) {
- $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$field}.
- '</td><td bgcolor="#CCCCCC">'.
- &prettyprint($field,$content{$field}).'</td></tr>';
+ 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(<<ENDHEAD);
-<h2>$title</h2>
-<p>
-$disuri<br />
-$obsoletewarning
-$versiondisplay
-</p>
-<table cellspacing="2" border="0">
-$table
-</table>
-ENDHEAD
+ $r->print("<h2>$title</h2>"
+ .'<p>'
+ .$disuri.'<br />'
+ .$obsoletewarning
+ .$versiondisplay
+ .'</p>'
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .$table
+ .&Apache::lonhtmlcommon::end_pick_box()
+ );
if (!$uploaded && $env{'user.adv'}) {
&print_dynamic_metadata($r,$uri,\%content);
}
@@ -943,17 +974,21 @@ sub print_dynamic_metadata {
exists($dynmeta{'goto'}) ||
exists($dynmeta{'course'})) {
$r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>'.
- '<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");
+ &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('</table>');
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
$r->print('<h4>'.&mt('No Access or Usages Statistics are available for this resource.').'</h4>');
}
@@ -968,35 +1003,40 @@ sub print_dynamic_metadata {
$r->print('<h4>'.
&mt('Overall Assessment Statistical Data').
'</h4>'.
- '<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");
+ &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('</table>');
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
}
if (exists($dynmeta{'stats'})) {
#
# New assessment statistics
$r->print('<h4>'.
- &mt('Detailed Assessment Statistical Data').
+ &mt('Recent Detailed Assessment Statistical Data').
'</h4>');
- my $table = '<table cellspacing="2" border="0">'.
- '<tr>'.
- '<th>Course</th>'.
- '<th>Section(s)</th>'.
- '<th>Num Students</th>'.
- '<th>Mean Tries</th>'.
- '<th>Degree of Difficulty</th>'.
- '<th>Degree of Discrimination</th>'.
- '<th>Time of computation</th>'.
- '</tr>'.$/;
+ 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 Students').'</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().$/;
foreach my $identifier (sort(keys(%{$dynmeta{'stats'}}))) {
my $data = $dynmeta{'stats'}->{$identifier};
my $course = $data->{'course'};
@@ -1007,33 +1047,32 @@ sub print_dynamic_metadata {
&Apache::lonnet::logthis('lookup for '.$course.' failed');
next;
}
- $table .= '<tr>';
+ $table .= &Apache::loncommon::start_data_table_row();
$table .=
- '<td><nobr>'.$courseinfo{'description'}.'</nobr></td>';
+ '<td><span class="LC_nobreak">'.$courseinfo{'description'}.'</span></td>';
$table .=
'<td align="right">'.$data->{'sections'}.'</td>';
$table .=
'<td align="right">'.$data->{'stdno'}.'</td>';
- foreach ('avetries','difficulty','disc') {
+ foreach my $item ('avetries','difficulty','disc') {
$table .= '<td align="right">';
- if (exists($data->{$_})) {
- $table .= sprintf('%.2f',$data->{$_}).' ';
+ if (exists($data->{$item})) {
+ $table .= sprintf('%.2f',$data->{$item}).' ';
} else {
$table .= '';
}
$table .= '</td>';
}
$table .=
- '<td><nobr>'.
+ '<td><span class="LC_nobreak">'.
&Apache::lonlocal::locallocaltime($data->{'timestamp'}).
- '</nobr></td>';
- $table .=
- '</tr>'.$/;
+ '</span></td>';
+ $table .= &Apache::loncommon::end_data_table_row().$/;
}
- $table .= '</table>'.$/;
+ $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('<h4>'.
@@ -1049,13 +1088,19 @@ sub print_dynamic_metadata {
exists($dynmeta{'correct'}) ||
exists($dynmeta{'technical'})){
$r->print('<h4>'.&mt('Evaluation Data').'</h4>'.
- '<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");
+ &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('</table>');
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
$r->print('<h4>'.&mt('No Evaluation Data is available for this resource.').'</h4>');
}
@@ -1083,32 +1128,45 @@ sub print_dynamic_metadata {
# All other stuff
$r->print('<h3>'.
&mt('Additional Metadata (non-standard, parameters, exports)').
- '</h3><table border="0" cellspacing="1">');
- foreach (sort(keys(%content))) {
- my $name=$_;
- if ($name!~/\.display$/) {
+ '</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);
+
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('<tr><td bgcolor="#bbccbb"><font size="-1" color="#556655">'.$display.'</font></td><td bgcolor="#ccddcc"><font size="-1" color="#556655">'.$content{$name});
+ $r->print(&Apache::lonhtmlcommon::row_title($display)
+ .$content{$name}
+ );
if ($otherinfo) {
$r->print(' ('.$otherinfo.')');
}
- $r->print("</font></td></tr>\n");
+ $r->print(&Apache::lonhtmlcommon::row_closure($lastrow));
}
}
- $r->print("</table>");
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
return;
}
@@ -1171,17 +1229,20 @@ ENDBOMBS
<input type="submit" name="clearmsg" value="$clear" />
ENDDEL
} else {
- $r->print('<a href="'.$disuri.'" />'.$goback.'</a>');
+ $r->print('<p><a href="'.$disuri.'">'.$goback.'</a></p>');
+ if ($env{'form.clearmsg'}) {
+ my ($diruri) = ($disuri =~ m{(.*/)[^/]*});
+ $r->print('<p><a href="'.$diruri.'">'.
+ &mt('Back To Directory').'</a></p>');
+ }
}
$r->print('<br />'.$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=();
@@ -1191,18 +1252,43 @@ 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(<<ENDEDIT);
<h1>$displayfile</h1>
<form method="post" action="" name="defaultmeta">
ENDEDIT
- $r->print('<script type="JavaScript">'.
- &Apache::loncommon::browser_and_searcher_javascript().
- '</script>');
my %lt=&fieldnames($file_type);
my $output;
my @fields;
my $added_metadata_fields;
my @added_order;
+ if ($file_type eq 'groups') {
+ $Apache::lonpublisher::metadatafields{'courserestricted'}=
+ 'course.'.$env{'request.course.id'};
+ }
+ if ((! $Apache::lonpublisher::metadatafields{'courserestricted'}) &&
+ (! $env{'form.new_courserestricted'}) && (! $file_type eq 'groups')) {
+ $Apache::lonpublisher::metadatafields{'courserestricted'}=
+ 'none';
+ } elsif ($env{'form.new_courserestricted'}) {
+ $Apache::lonpublisher::metadatafields{'courserestricted'}=
+ $env{'form.new_courserestricted'};
+ }
if ($file_type eq 'portfolio' || $file_type eq 'groups') {
if(exists ($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'})) {
# retrieve fieldnames (in order) from the course restricted list
@@ -1212,11 +1298,14 @@ ENDEDIT
@fields = ('author','title','subject','keywords','abstract',
'notes','lowestgradelevel',
'highestgradelevel','standards');
- $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames();
- if ($env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'}) {
- @added_order = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
- }
- $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join(",",@fields);
+ if ($Apache::lonpublisher::metadatafields{'courserestricted'} =~ /^course\.($match_domain\_$match_courseid)$/) {
+ my $assoc_crs = $1;
+ $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames($assoc_crs);
+ if ($env{'course.'.$assoc_crs.'.metadata.addedorder'}) {
+ @added_order = split(/,/,$env{'course.'.$assoc_crs.'.metadata.addedorder'});
+ }
+ $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join(",",@fields);
+ }
}
} else {
@fields = ('author','title','subject','keywords','abstract','notes',
@@ -1225,18 +1314,6 @@ 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'}) && (! $file_type eq 'groups')) {
- $Apache::lonpublisher::metadatafields{'courserestricted'}=
- 'none';
- } elsif ($env{'form.new_courserestricted'}) {
- $Apache::lonpublisher::metadatafields{'courserestricted'}=
- $env{'form.new_courserestricted'};
- }
if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
$Apache::lonpublisher::metadatafields{'copyright'}=
'default';
@@ -1250,15 +1327,27 @@ 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') {
- $r->print(&mt('Associated with course [_1]',
+
+ if ($file_type eq 'portfolio') {
+ $r->print(&mt('Associated with course [_1]',
'<strong><a href="'.$uri.'?changecourse=true">'.
$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.
".description"}.
'</a></strong>').'<br />');
+ } else {
+ $r->print(&mt('Associated with course [_1]',
+ '<strong>'.
+ $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.
+ ".description"}.'</strong>').'<br />');
+ }
} else {
- $r->print('<a href="'.$uri.'?changecourse=true">This resource is not associated with a course.</a><br />');
+ $r->print('<a href="'.$uri.'?changecourse=true">'.&mt('This resource is not associated with a course.').'</a><br />');
}
}
if (@added_order) {
@@ -1276,8 +1365,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'})) {
@@ -1306,69 +1402,22 @@ 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},
- '<>&"').
- '</'.$tag.'>';
- }
- 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));
- } else {
- if (! ($mfh=Apache::File->new('>'.$fn))) {
- $r->print('<p><font color="red">'.
- &mt('Could not write metadata').', '.
- &mt('FAIL').'</font></p>');
- } else {
- print $mfh ($file_content);
- $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
- ' '.&Apache::lonlocal::locallocaltime(time).
- '</font></p>');
- }
- }
+ my ($outcome,$result) = &store_metadata($fn,$uri,'store');
+ $r->print($result);
}
- $r->print($output.'<br /><input type="submit" name="store" value="'.
- &mt('Store Catalog Information').'" />');
+ $r->print($output.'<br /><input type="submit" title="'.&mt('Save Metadata').'" name="store" value="'.
+ &mt('Save').'" />');
- if ($file_type eq 'portfolio') {
+ if ($file_type eq 'portfolio' || $file_type eq 'groups') {
my ($port_path,$group) = &get_port_path_and_group($uri);
- if ($group) {
+ if ($group ne '') {
$r->print('<input type="hidden" name="group" value="'.$group.'" />');
}
$r->print('<input type="hidden" name="currentpath" value="'.$env{'form.currentpath'}.'" />');
$r->print('</form><br /><br /><form method="post" action="'.$port_path.'">');
- if ($group) {
+ if ($group ne '') {
$r->print('<input type="hidden" name="group" value="'.$group.'" />');
- }
+ }
$r->print('<input type="hidden" name="currentpath" value="'.$path.'" />'.
'<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'" />');
}
@@ -1379,21 +1428,238 @@ 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},'<>&"').
+ '</'.$tag.'>';
+ }
+ 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 .= '<p><font color="red">';
+ 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').'</font></p>';
+ $outcome = 'fail';
+ } else {
+ print $mfh ($file_content);
+ close($mfh);
+ &update_metadata_table($uri);
+ $output .= '<p><font color="blue">';
+ if ($caller eq 'transfer') {
+ $output .= &mt('Transferred data in added fields to notes');
+ } else {
+ $output .= &mt('Wrote Metadata');
+ }
+ $output .= ' '.&Apache::lonlocal::locallocaltime(time).
+ '</font></p>';
+ $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) = @_;
+ 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 '<p><font color="red">'.
- &mt('Could not write metadata').', '.
- &mt('FAIL').'</font></p>';
+ $output = '<p><font color="red">';
+ 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').'</font></p>';
+ $outcome = 'fail';
} else {
- return '<p><font color="blue">'.&mt('Wrote Metadata').
- ' '.&Apache::lonlocal::locallocaltime(time).'</font></p>';
+ &update_metadata_table($uri);
+ $output = '<p><font color="blue">';
+ if ($caller eq 'transfer') {
+ $output .= &mt('Transferred data in added fields to notes');
+ } else {
+ $output .= &mt('Wrote Metadata');
+ }
+ $output .= ' '.&Apache::lonlocal::locallocaltime(time).
+ '</font></p>';
+ $outcome = 'ok';
+ }
+ return ($outcome,$output);
+}
+
+sub update_metadata_table {
+ my ($uri) = @_;
+ 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,
+ $file_name);
+ my $access_hash = $access_controls{$file_name};
+ my $available = 0;
+ if (ref($access_hash) eq 'HASH') {
+ foreach my $key (keys(%{$access_hash})) {
+ my ($num,$scope,$end,$start) =
+ ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+ if ($scope eq 'public' || $scope eq 'guest') {
+ $available = 1;
+ last;
+ }
+ }
+ }
+ if ($available) {
+ my $result =
+ &Apache::lonnet::update_portfolio_table($uname,$udom,
+ $file_name,'portfolio_metadata',$group,'update');
}
}
+
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