--- loncom/interface/lonmeta.pm 2006/08/04 22:16:38 1.164
+++ loncom/interface/lonmeta.pm 2006/11/04 01:50:31 1.186
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.164 2006/08/04 22:16:38 albertel Exp $
+# $Id: lonmeta.pm,v 1.186 2006/11/04 01:50:31 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -95,7 +95,8 @@ sub get_dynamic_metadata_from_sql {
while (my $result = <$fh>) {
chomp($result);
next if (! $result);
- my %hash=&LONCAPA::lonmetadata::metadata_col_to_hash(map { &unescape($_) } split(/\,/,$result));
+ my %hash=&LONCAPA::lonmetadata::metadata_col_to_hash('metadata',
+ map { &unescape($_) } split(/\,/,$result));
foreach my $key (keys(%hash)) {
$ReturnHash{$hash{'url'}}->{$key}=$hash{$key};
}
@@ -237,12 +238,6 @@ sub fieldnames {
if (! defined($file_type) || $file_type ne 'portfolio') {
%fields =
- (%fields,
- 'courserestricted' => 'Course Restricting Metadata');
- }
-
- if (! defined($file_type) || $file_type ne 'portfolio') {
- %fields =
(%fields,
'domain' => 'Domain',
'mime' => 'MIME Type',
@@ -287,15 +282,22 @@ sub portfolio_linked_path {
if ($group) {
$start = "groups/$group/".$start;
}
- my $result = &Apache::portfolio::make_anchor($port_path,$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($port_path,$dir,$fullpath);
+ my %anchor_fields = (
+ 'selectfile' => $dir,
+ 'currentpath' => $fullpath
+ );
+ $result .= &Apache::portfolio::make_anchor($port_path,\%anchor_fields,$dir);
}
$result .= "/$filename";
return $result;
@@ -358,14 +360,20 @@ 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>');
my ($port_path,$group) = &get_port_path_and_group($uri);
- $r->print('<br /><br /><form method="POST" action="'.$port_path.'">'.
+ 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="hidden" name="group" value="'.$group.'" />'.
- '<input type="submit" name="cancel" value="'.&mt('Cancel').'">'.
+ $group_input.
+ '<input type="submit" name="cancel" value="'.&mt('Cancel').'" />'.
'</form>');
return;
@@ -461,7 +469,7 @@ sub prettyprint {
($type eq 'sequsage_list') ||
($type eq 'dependencies')) {
return '<font size="-1"><ul>'.join("\n",map {
- my $url = &Apache::lonnet::clutter($_);
+ my $url = &Apache::lonnet::clutter_with_no_wrapper($_);
my $title = &Apache::lonnet::gettitle($url);
if ($title eq '') {
$title = 'Untitled';
@@ -498,6 +506,7 @@ sub prettyprint {
if ($type=~/\_list/) {
my @Courses = split(/\s*\,\s*/,$value);
my $Str='<font size="-1"><ul>';
+ my %descriptions;
foreach my $course (@Courses) {
my %courseinfo =
&Apache::lonnet::coursedescription($course,
@@ -505,10 +514,16 @@ sub prettyprint {
if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
next;
}
- $Str .= '<li><a href="/public/'.$courseinfo{'domain'}.'/'.
+ $descriptions{join('\0',@courseinfo{'domain','description'})} .=
+ '<li><a href="/public/'.$courseinfo{'domain'}.'/'.
$courseinfo{'num'}.'/syllabus" target="preview">'.
- $courseinfo{'description'}.'</a></li>';
+ $courseinfo{'description'}.' ('.$courseinfo{'domain'}.
+ ')</a></li>';
}
+ foreach my $course (sort {lc($a) cmp lc($b)} (keys(%descriptions))) {
+ $Str .= $descriptions{$course};
+ }
+
return $Str.'</ul></font>';
}
# No pretty print found
@@ -594,9 +609,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));
@@ -611,7 +628,7 @@ sub prettyinput {
$relatedvalue);
}
return ($output);
- }
+ }
if (($type eq 'lowestgradelevel') ||
($type eq 'highestgradelevel')) {
return &Apache::loncommon::select_level_form($value,$fieldname).
@@ -706,14 +723,14 @@ 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+)\//);
if ($uri=~m:/adm/bombs/(.*)$:) {
@@ -729,8 +746,23 @@ sub handler {
if ($env{'form.store'}) {
&present_editable_metadata($r,$uri,'portfolio');
} else {
- &pre_select_course($r,$uri);
+ my $fn=&Apache::lonnet::filelocation('',$uri);
+ %Apache::lonpublisher::metadatafields=();
+ %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'}) {
+ &pre_select_course($r,$uri);
+ } else {
+ &present_editable_metadata($r,$uri,'portfolio');
+ }
}
+ } 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::start_page('Edit Catalog nformation',
@@ -807,8 +839,7 @@ sub present_uneditable_metadata {
# displayed url
my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
$uri=~s/\.meta$//;
- my $disuri=&Apache::lonnet::clutter($uri);
- $disuri=~s/^\/adm\/wrapper//;
+ my $disuri=&Apache::lonnet::clutter_with_no_wrapper($uri);
# version
my $versiondisplay='';
if (!$uploaded) {
@@ -1091,7 +1122,7 @@ 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;
@@ -1132,7 +1163,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);
@@ -1162,27 +1193,44 @@ 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;
+ my @added_order;
+ 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();
+ 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);
+ }
} else {
@fields = ('author','title','subject','keywords','abstract','notes',
- 'copyright','customdistributionfile','language',
- 'standards',
- 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
- 'obsolete','obsoletereplacement');
+ 'copyright','customdistributionfile','language',
+ 'standards',
+ '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'}) {
@@ -1193,7 +1241,7 @@ ENDEDIT
$Apache::lonpublisher::metadatafields{'copyright'}=
'default';
}
- if ($file_type eq 'portfolio') {
+ if (($file_type eq 'portfolio') || ($file_type eq 'groups')) {
if (! $Apache::lonpublisher::metadatafields{'mime'}) {
($Apache::lonpublisher::metadatafields{'mime'}) =
( $target=~/\.(\w+)$/ );
@@ -1210,8 +1258,18 @@ ENDEDIT
$r->print("This resource is not associated with a course.<br />");
}
}
+ if (@added_order) {
+ foreach my $field_name (@added_order) {
+ push(@fields,$field_name);
+ $lt{$field_name} = $$added_metadata_fields{$field_name};
+ }
+ } else {
+ 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));
@@ -1219,8 +1277,9 @@ ENDEDIT
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')){
+ if ((($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
+ ($field_name eq 'courserestricted'))&&
+ (!($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/))){
$output.=("\n".'<p>'.$lt{$field_name}.': '.
&prettyinput($field_name,
$Apache::lonpublisher::metadatafields{$field_name},
@@ -1231,9 +1290,9 @@ ENDEDIT
} else {
$output.=('<p>'.$lt{$field_name}.': '.
- &prettyinput($field_name,
- $Apache::lonpublisher::metadatafields{$field_name},
- 'new_'.$field_name,'defaultmeta').'</p>');
+ &prettyinput($field_name,
+ $Apache::lonpublisher::metadatafields{$field_name},
+ 'new_'.$field_name,'defaultmeta').'</p>');
}
}
@@ -1245,22 +1304,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(/\,/,
- $Apache::lonpublisher::metadatakeys{$unikey})
- ) {
+ 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
@@ -1268,40 +1325,43 @@ ENDEDIT
'<>&"').
'</'.$tag.'>';
}
- if ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles/portfolio/|) {
- my ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|);
+ 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));
- } elsif ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles/groups/\w+/portfolio/|) {
- my ($path, $new_fn) = ($fn =~ m|/(groups/\w+/portfolio.*)/([^/]*)$|);
- $r->print(&store_portfolio_metadata($formname,$file_content,$path,$new_fn));
- } else {
- if (! ($mfh=Apache::File->new('>'.$fn))) {
+ $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;
+ print $mfh ($file_content);
$r->print('<p><font color="blue">'.&mt('Wrote Metadata').
' '.&Apache::lonlocal::locallocaltime(time).
'</font></p>');
}
}
}
-
$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('</form>
- <br /><br /><form method="POST" action="'.$port_path.'">'.
- '<input type="hidden" name="group" value="'.$group.'" />'.
- '<input type="hidden" name="currentpath" value="'.$path.'" />'.
- '<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'">');
+ $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').'" />');
}
}