--- loncom/interface/lonmeta.pm 2005/12/19 21:49:12 1.146
+++ loncom/interface/lonmeta.pm 2006/09/28 23:37:57 1.179
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.146 2005/12/19 21:49:12 albertel Exp $
+# $Id: lonmeta.pm,v 1.179 2006/09/28 23:37:57 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,6 +39,8 @@ use Apache::lonpublisher;
use Apache::lonlocal;
use Apache::lonmysql;
use Apache::lonmsg;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
############################################################
@@ -71,20 +73,7 @@ sub get_dynamic_metadata_from_sql {
if (! defined($authordom) || ! defined($author)) {
return ();
}
- my @Fields = ('url','count','course',
- 'goto','goto_list',
- 'comefrom','comefrom_list',
- 'sequsage','sequsage_list',
- 'stdno','stdno_list',
- 'dependencies',
- 'avetries','avetries_list',
- 'difficulty','difficulty_list',
- 'disc','disc_list',
- 'clear','technical','correct',
- 'helpful','depth');
- #
- my $query = 'SELECT '.join(',',@Fields).
- ' FROM metadata WHERE url LIKE "'.$url.'%"';
+ my $query = 'SELECT * FROM metadata WHERE url LIKE "'.$url.'%"';
my $server = &Apache::lonnet::homeserver($author,$authordom);
my $reply = &Apache::lonnet::metadata_query($query,undef,undef,
,[$server]);
@@ -106,13 +95,9 @@ sub get_dynamic_metadata_from_sql {
while (my $result = <$fh>) {
chomp($result);
next if (! $result);
- my @Data =
- map {
- &Apache::lonnet::unescape($_);
- } split(',',$result);
- my $url = $Data[0];
- for (my $i=0;$i<=$#Fields;$i++) {
- $ReturnHash{$url}->{$Fields[$i]}=$Data[$i];
+ my %hash=&LONCAPA::lonmetadata::metadata_col_to_hash(map { &unescape($_) } split(/\,/,$result));
+ foreach my $key (keys(%hash)) {
+ $ReturnHash{$hash{'url'}}->{$key}=$hash{$key};
}
}
$finished = 1;
@@ -185,7 +170,7 @@ sub authordisplay {
my ($aname,$adom)=@_;
return &Apache::loncommon::aboutmewrapper
(&Apache::loncommon::plainname($aname,$adom),
- $aname,$adom,'preview').' <tt>['.$aname.'@'.$adom.']</tt>';
+ $aname,$adom,'preview').' <tt>['.$aname.':'.$adom.']</tt>';
}
# Pretty display
@@ -248,9 +233,8 @@ sub fieldnames {
'notes' => 'Notes',
'abstract' => 'Abstract',
'lowestgradelevel' => 'Lowest Grade Level',
- 'highestgradelevel' => 'Highest Grade Level',
- 'courserestricted' => 'Course Restricting Metadata');
-
+ 'highestgradelevel' => 'Highest Grade Level');
+
if (! defined($file_type) || $file_type ne 'portfolio') {
%fields =
(%fields,
@@ -291,34 +275,69 @@ sub fieldnames {
}
sub portfolio_linked_path {
- my ($path) = @_;
- my $result = &Apache::portfolio::make_anchor('portfolio','/');
+ my ($path,$group,$port_path) = @_;
+
+ my $start = 'portfolio';
+ if ($group) {
+ $start = "groups/$group/".$start;
+ }
+ my %anchor_fields = (
+ 'selectfile' => $start,
+ 'currentpath' => '/'
+ );
+ my $result = &Apache::portfolio::make_anchor($port_path,\%anchor_fields,$start);
my $fullpath = '/';
my (undef,@tree) = split('/',$path);
+ my $filename = pop(@tree);
foreach my $dir (@tree) {
$fullpath .= $dir.'/';
$result .= '/';
- $result .= &Apache::portfolio::make_anchor($dir,$fullpath);
+ my %anchor_fields = (
+ 'selectfile' => $dir,
+ 'currentpath' => $fullpath
+ );
+ $result .= &Apache::portfolio::make_anchor($port_path,\%anchor_fields,$dir);
}
+ $result .= "/$filename";
return $result;
}
+sub get_port_path_and_group {
+ my ($uri)=@_;
+
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+ my ($port_path,$group);
+ if ($uri =~ m{^/editupload/\Q$cdom\E/\Q$cnum\E/groups/}) {
+ $group = (split('/',$uri))[5];
+ $port_path = '/adm/coursegrp_portfolio';
+ } else {
+ $port_path = '/adm/portfolio';
+ }
+ if ($env{'form.group'} ne $group) {
+ $env{'form.group'} = $group;
+ }
+ return ($port_path,$group);
+}
+
sub portfolio_display_uri {
my ($uri,$as_links)=@_;
+
+ my ($port_path,$group) = &get_port_path_and_group($uri);
+
$uri =~ s|.*/(portfolio/.*)$|$1|;
my ($res_uri,$meta_uri) = ($uri,$uri);
-
if ($uri =~ /\.meta$/) {
$res_uri =~ s/\.meta//;
} else {
$meta_uri .= '.meta';
}
- my ($path) = ($res_uri =~ m|(.*)/[^/]*$|);
-
+ my ($path) = ($res_uri =~ m|^portfolio(.*/)[^/]*$|);
if ($as_links) {
- $res_uri = &portfolio_linked_path($res_uri);
- $meta_uri = &portfolio_linked_path($meta_uri);
+ $res_uri = &portfolio_linked_path($res_uri,$group,$port_path);
+ $meta_uri = &portfolio_linked_path($meta_uri,$group,$port_path);
}
return ($res_uri,$meta_uri,$path);
}
@@ -340,47 +359,50 @@ sub pre_select_course {
$r->print('<p>'.&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\'','<tt>'.$res_uri.'</tt>').'</p>');
$output = &select_course();
$r->print($output.'<br /><input type="submit" name="store" value="'.
- &mt('Associate Resource With Selected Course').'">');
+ &mt('Associate Resource With Selected Course').'" />');
+ $r->print('<input type="hidden" name="currentpath" value="'.$env{'form.currentpath'}.'" />');
+ $r->print('<input type="hidden" name="associate" value="true" />');
$r->print('</form>');
- $r->print('<br /><br /><form method="POST" action="/adm/portfolio">'.
+ my ($port_path,$group) = &get_port_path_and_group($uri);
+ my $group_input;
+ if ($group) {
+ $group_input = '<input type="hidden" name="group" value="'.$group.'" />';
+ }
+ $r->print('<br /><br /><form method="post" action="'.$port_path.'">'.
'<input type="hidden" name="currentpath" value="'.$path.'" />'.
- '<input type="submit" name="cancel" value="'.&mt('Cancel').'">'.
+ $group_input.
+ '<input type="submit" name="cancel" value="'.&mt('Cancel').'" />'.
'</form>');
return;
}
sub select_course {
- my %courses;
- my $output;
- my $selected;
- foreach my $key (keys(%env)) {
- if ($key =~ m/\.metadata\./) {
- $key =~ m/^course\.(.+)(\.metadata.+$)/;
- my $course = $1;
- my $coursekey = 'course.'.$course.'.description';
- my $value = $env{$coursekey};
- $courses{$coursekey} = $value;
- }
- }
- my $meta_not_found = 1;
- if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq 'none') {
- $selected = ' SELECTED ';
- } else {
- $selected = '';
- }
+ my $output=$/;
+ my $current_restriction=
+ $Apache::lonpublisher::metadatafields{'courserestricted'};
+ my $selected = ($current_restriction eq 'none' ? 'selected="selected"'
+ : '');
+
$output .= '<select name="new_courserestricted" >';
- $output .= '<option value="none" '.$selected.'>None</option>';
- foreach my $key (keys (%courses)) {
- $key =~ m/(^.+)\.description$/;
- if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq $1) {
- $selected = ' SELECTED ';
- } else {
- $selected = '';
- }
- $output .= '<option value="'.$1.'"'.$selected.'>';
- $output .= $courses{$key};
- $output .= '</option>';
+ $output .= '<option value="none" '.$selected.'>'.
+ &mt('None').'</option>'.$/;
+ my %courses;
+ foreach my $key (keys(%env)) {
+ if ($key !~ m/^course\.(.+)\.description$/) { next; }
+ my $cid = $1;
+ if ($env{$key} !~ /\S/) { next; }
+ $courses{$key} = $cid;
+ }
+ foreach my $key (sort { lc($env{$a}) cmp lc($env{$b}) } (keys(%courses))) {
+ my $cid = 'course.'.$courses{$key};
+ my $selected = ($current_restriction eq $cid ? 'selected="selected"'
+ : '');
+ if ($env{$key} !~ /\S/) { next; }
+ $output .= '<option value="'.$cid.'" '.$selected.'>';
+ $output .= $env{$key};
+ $output .= '</option>'.$/;
+ $selected = '';
}
$output .= '</select><br />';
return ($output);
@@ -445,7 +467,7 @@ sub prettyprint {
($type eq 'comefrom_list') ||
($type eq 'sequsage_list') ||
($type eq 'dependencies')) {
- return '<ul><font size="-1">'.join("\n",map {
+ return '<font size="-1"><ul>'.join("\n",map {
my $url = &Apache::lonnet::clutter($_);
my $title = &Apache::lonnet::gettitle($url);
if ($title eq '') {
@@ -482,18 +504,19 @@ sub prettyprint {
# List of courses
if ($type=~/\_list/) {
my @Courses = split(/\s*\,\s*/,$value);
- my $Str;
+ my $Str='<font size="-1"><ul>';
foreach my $course (@Courses) {
- my %courseinfo = &Apache::lonnet::coursedescription($course);
+ my %courseinfo =
+ &Apache::lonnet::coursedescription($course,
+ {'one_time' => 1});
if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
next;
}
- if ($Str ne '') { $Str .= '<br />'; }
- $Str .= '<a href="/public/'.$courseinfo{'domain'}.'/'.
+ $Str .= '<li><a href="/public/'.$courseinfo{'domain'}.'/'.
$courseinfo{'num'}.'/syllabus" target="preview">'.
- $courseinfo{'description'}.'</a>';
+ $courseinfo{'description'}.'</a></li>';
}
- return $Str;
+ return $Str.'</ul></font>';
}
# No pretty print found
return $value;
@@ -542,7 +565,8 @@ sub prettyinput {
$size = 80;
}
my $output;
- if (defined($course_key)) {
+ if (defined($course_key)
+ && exists($env{$course_key.'.metadata.'.$type.'.options'})) {
my $stu_add;
my $only_one;
my %meta_options;
@@ -577,9 +601,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')) {
+ || ($type eq 'abstract')|| ($type eq 'title')|| ($type eq 'standards')
+ || (exists($env{'course.'.$env{'request.course.id'}.'.metadata.'.$type.'.added'}))) {
if ($values) {
if ($only_one) {
$output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,%meta_options));
@@ -594,7 +620,7 @@ sub prettyinput {
$relatedvalue);
}
return ($output);
- }
+ }
if (($type eq 'lowestgradelevel') ||
($type eq 'highestgradelevel')) {
return &Apache::loncommon::select_level_form($value,$fieldname).
@@ -689,45 +715,49 @@ sub prettyinput {
# Main Handler
sub handler {
my $r=shift;
- #
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['currentpath']);
my $uri=$r->uri;
#
# Set document type
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
- #
my ($resdomain,$resuser)=
(&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
- my $html=&Apache::lonxml::xmlbegin();
- $r->print($html.'<head><title>'.
- 'Catalog Information'.
- '</title></head>');
if ($uri=~m:/adm/bombs/(.*)$:) {
- $r->print(&Apache::loncommon::bodytag('Error Messages'));
+ $r->print(&Apache::loncommon::start_page('Error Messages'));
# Looking for all bombs?
&report_bombs($r,$uri);
- } elsif ($uri=~/\/portfolio\//) {
+ } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) {
($resdomain,$resuser)=
- (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
- $r->print(&Apache::loncommon::bodytag
- ('Edit Portfolio File Information','','','',$resdomain));
+ (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
+ $r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information',
+ undef,
+ {'domain' => $resdomain,}));
if ($env{'form.store'}) {
&present_editable_metadata($r,$uri,'portfolio');
} else {
&pre_select_course($r,$uri);
}
- } elsif ($uri=~/^\/\~/) {
+ } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) {
+ $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information',
+ undef,
+ {'domain' => $resdomain,}));
+ &present_editable_metadata($r,$uri,'groups');
+ } elsif ($uri=~m|^/~|) {
# Construction space
- $r->print(&Apache::loncommon::bodytag
- ('Edit Catalog Information','','','',$resdomain));
+ $r->print(&Apache::loncommon::start_page('Edit Catalog nformation',
+ undef,
+ {'domain' => $resdomain,}));
&present_editable_metadata($r,$uri);
} else {
- $r->print(&Apache::loncommon::bodytag
- ('Catalog Information','','','',$resdomain));
+ $r->print(&Apache::loncommon::start_page('Catalog Information',
+ undef,
+ {'domain' => $resdomain,}));
&present_uneditable_metadata($r,$uri);
}
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::end_page());
return OK;
}
@@ -781,6 +811,7 @@ ENDCLEAR
sub present_uneditable_metadata {
my ($r,$uri) = @_;
#
+ my $uploaded = ($uri =~ m|/uploaded/|);
my %content=();
# Read file
foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
@@ -791,17 +822,20 @@ sub present_uneditable_metadata {
my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
$uri=~s/\.meta$//;
my $disuri=&Apache::lonnet::clutter($uri);
+ $disuri=~s/^\/adm\/wrapper//;
# version
- my $currentversion=&Apache::lonnet::getversion($disuri);
my $versiondisplay='';
- if ($thisversion) {
- $versiondisplay=&mt('Version').': '.$thisversion.
- ' ('.&mt('most recent version').': '.
- ($currentversion>0 ?
- $currentversion :
- &mt('information not available')).')';
- } else {
- $versiondisplay='Version: '.$currentversion;
+ if (!$uploaded) {
+ my $currentversion=&Apache::lonnet::getversion($disuri);
+ if ($thisversion) {
+ $versiondisplay=&mt('Version').': '.$thisversion.
+ ' ('.&mt('most recent version').': '.
+ ($currentversion>0 ?
+ $currentversion :
+ &mt('information not available')).')';
+ } else {
+ $versiondisplay='Version: '.$currentversion;
+ }
}
# crumbify displayed URL uri target prefix form size
$disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1');
@@ -821,30 +855,38 @@ sub present_uneditable_metadata {
if (! defined($title)) {
$title = 'Untitled Resource';
}
- foreach ('title',
- 'author',
- 'subject',
- 'keywords',
- 'notes',
- 'abstract',
- 'lowestgradelevel',
- 'highestgradelevel',
- 'standards',
- 'mime',
- 'language',
- 'creationdate',
- 'lastrevisiondate',
- 'owner',
- 'copyright',
- 'customdistributionfile',
- 'sourceavail',
- 'sourcerights',
- 'obsolete',
- 'obsoletereplacement') {
- $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$_}.
+ my @fields;
+ if ($uploaded) {
+ @fields = ('title','author','subject','keywords','notes','abstract',
+ 'lowestgradelevel','highestgradelevel','standards','mime',
+ 'owner');
+ } else {
+ @fields = ('title',
+ 'author',
+ 'subject',
+ 'keywords',
+ 'notes',
+ 'abstract',
+ 'lowestgradelevel',
+ 'highestgradelevel',
+ 'standards',
+ 'mime',
+ 'language',
+ 'creationdate',
+ 'lastrevisiondate',
+ 'owner',
+ 'copyright',
+ 'customdistributionfile',
+ 'sourceavail',
+ 'sourcerights',
+ 'obsolete',
+ 'obsoletereplacement');
+ }
+ foreach my $field (@fields) {
+ $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$field}.
'</td><td bgcolor="#CCCCCC">'.
- &prettyprint($_,$content{$_}).'</td></tr>';
- delete $content{$_};
+ &prettyprint($field,$content{$field}).'</td></tr>';
+ delete($content{$field});
}
#
$r->print(<<ENDHEAD);
@@ -858,7 +900,7 @@ $versiondisplay
$table
</table>
ENDHEAD
- if ($env{'user.adv'}) {
+ if (!$uploaded && $env{'user.adv'}) {
&print_dynamic_metadata($r,$uri,\%content);
}
return;
@@ -941,7 +983,9 @@ sub print_dynamic_metadata {
foreach my $identifier (sort(keys(%{$dynmeta{'stats'}}))) {
my $data = $dynmeta{'stats'}->{$identifier};
my $course = $data->{'course'};
- my %courseinfo = &Apache::lonnet::coursedescription($course);
+ my %courseinfo =
+ &Apache::lonnet::coursedescription($course,
+ {'one_time' => 1});
if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
&Apache::lonnet::logthis('lookup for '.$course.' failed');
next;
@@ -1061,19 +1105,20 @@ sub print_dynamic_metadata {
#####################################################
#####################################################
sub present_editable_metadata {
- my ($r,$uri, $file_type) = @_;
+ my ($r,$uri,$file_type) = @_;
# Construction Space Call
# Header
my $disuri=$uri;
my $fn=&Apache::lonnet::filelocation('',$uri);
- $disuri=~s/^\/\~/\/priv\//;
+ $disuri=~s{^/\~}{/priv/};
$disuri=~s/\.meta$//;
my $meta_uri = $disuri;
+ my $path;
if ($disuri =~ m|/portfolio/|) {
- ($disuri, $meta_uri) = &portfolio_display_uri($disuri,1);
+ ($disuri, $meta_uri, $path) = &portfolio_display_uri($disuri,1);
}
my $target=$uri;
- $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;
+ $target=~s{^/\~}{/res/$env{'request.role.domain'}/};
$target=~s/\.meta$//;
my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
if ($bombs) {
@@ -1101,7 +1146,7 @@ sub present_editable_metadata {
my $goback=&mt('Back to Source File');
$r->print(<<ENDBOMBS);
<h1>$disuri</h1>
-<form method="post" name="defaultmeta">
+<form method="post" action="" name="defaultmeta">
ENDBOMBS
if ($showdel) {
$r->print(<<ENDDEL);
@@ -1131,17 +1176,27 @@ ENDDEL
}
$r->print(<<ENDEDIT);
<h1>$displayfile</h1>
-<form method="post" name="defaultmeta">
+<form method="post" action="" name="defaultmeta">
ENDEDIT
- $r->print('<script language="JavaScript">'.
+ $r->print('<script type="JavaScript">'.
&Apache::loncommon::browser_and_searcher_javascript().
'</script>');
my %lt=&fieldnames($file_type);
my $output;
my @fields;
- if ($file_type eq 'portfolio') {
- @fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
- 'highestgradelevel','standards');
+ my $added_metadata_fields;
+ 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
+ @fields = (split /,/,$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'});
+ } else {
+ # no saved field list, use default list
+ @fields = ('author','title','subject','keywords','abstract',
+ 'notes','lowestgradelevel',
+ 'highestgradelevel','standards');
+ $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames();
+ $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join (",",@fields);
+ }
} else {
@fields = ('author','title','subject','keywords','abstract','notes',
'copyright','customdistributionfile','language',
@@ -1149,8 +1204,12 @@ 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'})) {
+ (! $env{'form.new_courserestricted'}) && (! $file_type eq 'groups')) {
$Apache::lonpublisher::metadatafields{'courserestricted'}=
'none';
} elsif ($env{'form.new_courserestricted'}) {
@@ -1159,21 +1218,36 @@ ENDEDIT
}
if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
$Apache::lonpublisher::metadatafields{'copyright'}=
- 'default';
+ 'default';
}
- if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
- $r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
- '</strong>').'<br />');
- } else {
- $r->print("This resource is not associated with a course.<br />");
+ if (($file_type eq 'portfolio') || ($file_type eq 'groups')) {
+ if (! $Apache::lonpublisher::metadatafields{'mime'}) {
+ ($Apache::lonpublisher::metadatafields{'mime'}) =
+ ( $target=~/\.(\w+)$/ );
+ }
+ if (! $Apache::lonpublisher::metadatafields{'owner'}) {
+ $Apache::lonpublisher::metadatafields{'owner'} =
+ $env{'user.name'}.':'.$env{'user.domain'};
+ }
+
+ if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
+ $r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
+ '</strong>').'<br />');
+ } else {
+ $r->print("This resource is not associated with a course.<br />");
+ }
+ }
+ foreach my $field_name(keys (%$added_metadata_fields)) {
+ push (@fields,$field_name);
+ $lt{$field_name} = $$added_metadata_fields{$field_name};
}
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));
}
- if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
+ if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none'
+ && exists($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'})) {
# handle restrictions here
if (($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
($field_name eq 'courserestricted')){
@@ -1201,22 +1275,20 @@ ENDEDIT
$Apache::lonpublisher::metadatafields{'keywords'} =
join (',', &Apache::loncommon::get_env_multiple('form.new_keywords'));
}
-
- foreach (sort keys %Apache::lonpublisher::metadatafields) {
- next if ($_ =~ /\./);
- my $unikey=$_;
- $unikey=~/^([A-Za-z]+)/;
+ 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 (split(/\,/,
+ foreach my $key (split(/\,/,
$Apache::lonpublisher::metadatakeys{$unikey})
) {
my $value=
- $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
+ $Apache::lonpublisher::metadatafields{$unikey.'.'.$key};
$value=~s/\"/\'\'/g;
- $file_content.=' '.$_.'="'.$value.'"' ;
- # print $mfh ' '.$_.'="'.$value.'"';
+ $file_content.=' '.$key.'="'.$value.'"' ;
}
$file_content.= '>'.
&HTML::Entities::encode
@@ -1224,23 +1296,16 @@ ENDEDIT
'<>&"').
'</'.$tag.'>';
}
- if ($fn =~ m|/portfolio/|) {
- my ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|);
- $env{'form.'.$formname}=$file_content."\n";
- $env{'form.'.$formname.'.filename'}=$new_fn;
- my $result =&Apache::lonnet::userfileupload($formname,'',
- $path);
-
- if ($result =~ /(error|notfound)/) {
- $r->print('<p><font color="red">'.
- &mt('Could not write metadata').', '.
- &mt('FAIL').'</font></p>');
- } else {
- $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
- ' '.&Apache::lonlocal::locallocaltime(time).
- '</font></p>');
- }
- } else {
+ if ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles|) {
+ my ($path, $new_fn);
+ if ($fn =~ m|\w+/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').', '.
@@ -1253,17 +1318,44 @@ ENDEDIT
}
}
}
-
$r->print($output.'<br /><input type="submit" name="store" value="'.
- &mt('Store Catalog Information').'">');
-
+ &mt('Store Catalog Information').'" />');
+
+ if ($file_type eq 'portfolio') {
+ my ($port_path,$group) = &get_port_path_and_group($uri);
+ if ($group) {
+ $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) {
+ $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').'" />');
+ }
}
+
$r->print('</form>');
return;
}
+sub store_portfolio_metadata {
+ my ($formname,$content,$path,$new_fn) = @_;
+ $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>';
+ } else {
+ return '<p><font color="blue">'.&mt('Wrote Metadata').
+ ' '.&Apache::lonlocal::locallocaltime(time).'</font></p>';
+ }
+}
+
1;
__END__
-