--- loncom/interface/lonmeta.pm 2005/10/14 04:24:12 1.111
+++ loncom/interface/lonmeta.pm 2005/11/08 03:08:15 1.124
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.111 2005/10/14 04:24:12 banghart Exp $
+# $Id: lonmeta.pm,v 1.124 2005/11/08 03:08:15 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -247,7 +247,9 @@ sub fieldnames {
'notes' => 'Notes',
'abstract' => 'Abstract',
'lowestgradelevel' => 'Lowest Grade Level',
- 'highestgradelevel' => 'Highest Grade Level');
+ 'highestgradelevel' => 'Highest Grade Level',
+ 'courserestricted' => 'Course Restricting Metadata');
+
if (! defined($file_type) || $file_type ne 'portfolio') {
%fields =
(%fields,
@@ -290,40 +292,33 @@ sub fieldnames {
sub select_course {
my ($r)=@_;
- my @courses;
+ my %courses;
foreach my $key (keys (%env)) {
-
- if ($key =~ m/^(course\..+)\.metadata\..+\.options/) {
- my $course_key = $1;
- $course_key .= '.description';
- $r->print($env{$course_key}.' of '.$course_key.'<br />');
- push @courses, $key;
+ if ($key =~ m/\.metadata\./) {
+ $key =~ m/^course\.(.+)(\.metadata.+$)/;
+ my $course = $1;
+ my $coursekey = 'course.'.$course.'.description';
+ my $value = $env{$coursekey};
+ $courses{$coursekey} = $value;
}
}
- foreach (@courses) {
- $r->print($_.' was found<br />');
- }
- $r->print('<h3>Portfolio Meta-Data</h3><br />');
+ $r->print('<h3>Course Related Meta-Data</h3><br />');
$r->print('<form action="" method="post">');
$r->print('Select your test course<br />');
$r->print('<select name="metacourse" >');
my $meta_not_found = 1;
- foreach my $key (keys (%env)) {
-
- if ($key =~ /\.metadata\./) {
- if ($meta_not_found) {
- undef($meta_not_found);
- $r->print('<h3>Portfolio Meta-Data</h3><br />');
- $r->print('<form action="" method="post">');
- $r->print('Select your course<br />');
- $r->print('<select name="metacourse" >');
- }
- my $course_key = $key;
- $course_key =~ s/\.metadata\..*//;
- $r->print('<option value="'.$course_key.'">');
- $r->print($env{$course_key.'.description'});
- $r->print('</option>');
+ foreach my $key (keys (%courses)) {
+ if ($meta_not_found) {
+ undef($meta_not_found);
+ $r->print('<h3>Portfolio Meta-Data</h3><br />');
+ $r->print('<form action="" method="post">');
+ $r->print('Select your course<br />');
+ $r->print('<select name="metacourse" >');
}
+ $key =~ m/(^.+)\.description$/;
+ $r->print('<option value="'.$1.'">');
+ $r->print($courses{$key});
+ $r->print('</option>');
}
unless ($meta_not_found) {
$r->print('</select><br />');
@@ -484,10 +479,61 @@ sub relatedfield {
sub prettyinput {
my ($type,$value,$fieldname,$formname,
- $relatedsearchflag,$relatedsep,$relatedvalue,$size)=@_;
+ $relatedsearchflag,$relatedsep,$relatedvalue,$size,$course_key)=@_;
if (! defined($size)) {
$size = 80;
}
+ if (defined($course_key)) {
+ my $stu_add;
+ my $only_one;
+ my $values = $env{$course_key.'.metadata.'.$_.'.values'};
+ if ($env{$course_key.'.metadata.'.$_.'.options'} =~ m/stuadd/) {
+ $stu_add = 'true';
+ }
+ if ($env{$course_key.'.metadata.'.$_.'.options'} =~ m/onlyone/) {
+ $only_one = 'true';
+ }
+ if ($type eq 'author') {
+ }
+ if ($type eq 'courserestricted') {
+ return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+ }
+ if ($type eq 'authorspace') {
+ }
+ if ($type eq 'modifyinguser') {
+ }
+ if ($type eq 'subject') {
+ }
+ if ($type eq 'keywords') {
+ my %hash;
+ my $def;
+ my @cur_values;
+ foreach (split(/,/,$value)) {
+ $_ =~ s/^\s+//;
+ push(@cur_values,$_);
+ }
+ foreach (split(/,/,$values)) {
+ $_ =~ s/^\s+//;
+ $hash{$_} = $_;
+ }
+ if ($only_one) {
+ return(&Apache::loncommon::select_form($def,'new_keywords',%hash));
+ } else {
+ return(&Apache::loncommon::multiple_select_form('new_keywords',\@cur_values,undef,\%hash));
+ }
+ }
+ if ($type eq 'notes') {
+ }
+ if ($type eq 'abstract') {
+ }
+
+ if (($type eq 'lowestgradelevel') ||
+ ($type eq 'highestgradelevel')) {
+ return &Apache::loncommon::select_level_form($value,$fieldname).
+ &relatedfield(0,$relatedsearchflag,$relatedsep);
+ }
+ return();
+ }
# Language
if ($type eq 'language') {
return &selectbox($fieldname,
@@ -1015,8 +1061,8 @@ ENDEDIT
my $output;
my @fields;
if ($file_type eq 'portfolio') {
- @fields = ('author','metadata.title','metadata.subject','metadata.keywords','abstract','notes','lowestgradelevel',
- 'highestgradelevel');
+ @fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
+ 'highestgradelevel','courserestricted');
} else {
@fields = ('author','title','subject','keywords','abstract','notes',
'copyright','customdistributionfile','language',
@@ -1024,49 +1070,42 @@ ENDEDIT
'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
'obsolete','obsoletereplacement');
}
+ my $metacourse;
+ if ($env{'form.metacourse'} ) {
+ $Apache::lonpublisher::metadatafields{'courserestricted'} = $env{'form.metacourse'};
+ $metacourse = $env{'form.metacourse'};
+ } else {
+ if (! $Apache::lonpublisher::metadatafields{'courserestricted'}) {
+ $Apache::lonpublisher::metadatafields{'courserestricted'}=
+ 'none';
+ $metacourse = 'none';
+ } else {
+ $metacourse = $Apache::lonpublisher::metadatafields{'courserestricted'};
+ }
+ }
+ if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
+ $Apache::lonpublisher::metadatafields{'copyright'}=
+ 'default';
+ }
foreach (@fields) {
if (defined($env{'form.new_'.$_})) {
$Apache::lonpublisher::metadatafields{$_}=
- $env{'form.new_'.$_};
- }
- if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
- $Apache::lonpublisher::metadatafields{'copyright'}=
- 'default';
+ join(',',&Apache::loncommon::get_env_multiple('form.new_'.$_));
}
- $output.=('<p>'.$lt{$_}.': '.
- &prettyinput($_,
+ if ($metacourse ne 'none') {
+ # handle restrictions here
+ if (($env{$metacourse.'.metadata.'.$_.'.options'} =~ m/active/)||
+ ($_ eq 'courserestricted')) {
+ $output.=('<p>'.$lt{$_}.': '.
+ &prettyinput($_,
$Apache::lonpublisher::metadatafields{$_},
- 'new_'.$_,'defaultmeta').'</p>');
- if ($env{'form.metacourse'}) {
- $r->print('This is the instructor metadata area<br />');
- # have to find all the metadata items, so we'll loop through and find them
- $r->print('<form method="post" action="" size="3" >');
- $r->print('The course is: '.$env{'form.metacourse'}.'<br>');
- foreach my $key (sort keys %env) {
- if ($key=~m/^($env{'form.metacourse'}\.metadata\.)(\d+)\.title/) {
- my $key_base = $1;
- my $item_num = $2;
- # found one, so let's display it
- my $title = $env{$key_base.$item_num.'.title'};
- my $type = $env{$key_base.$item_num.'.type'};
- my @choices = sort(split /, /,$env{$key_base.$item_num.'.values'});
- $r->print($title.'<br />');
- $r->print($type.'<br />');
-
- foreach my $word (@choices) {
- my $checked;
- if ($Apache::lonpublisher::metadatafields{'coursekeyword'}=~ m/$word/) {
- $checked = 1;
- } else {
- undef($checked);
+ 'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
}
- $r->print(&Apache::lonhtmlcommon::checkbox('instmeta_'.$env{'form.metacourse'}.'_'.$item_num,$checked,$word).$word.'<br />');
- }
- }
- }
- $r->print('<br /><input type="submit" name="store" value="Assign Meta-data" />');
- $r->print('</form>');
- return 'ok';
+ } else {
+ $output.=('<p>'.$lt{$_}.': '.
+ &prettyinput($_,
+ $Apache::lonpublisher::metadatafields{$_},
+ 'new_'.$_,'defaultmeta').'</p>');
}
}
if ($env{'form.store'}) {
@@ -1074,12 +1113,9 @@ ENDEDIT
my $formname='store';
my $file_content;
foreach my $meta_field (keys %env) {
- if ($meta_field=~m/^form.instmeta_(.+)_(\d+)$/) {
- $r->print('Found a field<br>');
- }
- if (&Apache::loncommon::get_env_multiple('form.keywords')) {
- $Apache::lonpublisher::metadatafields{'coursekeyword'} =
- join (', ', &Apache::loncommon::get_env_multiple('form.keywords'));
+ if (&Apache::loncommon::get_env_multiple('form.new_keywords')) {
+ $Apache::lonpublisher::metadatafields{'keywords'} =
+ join (',', &Apache::loncommon::get_env_multiple('form.new_keywords'));
}
}
foreach (sort keys %Apache::lonpublisher::metadatafields) {
@@ -1111,7 +1147,6 @@ ENDEDIT
$env{'form.'.$formname.'.filename'}=$new_fn;
&Apache::lonnet::userfileupload('uploaddoc','',
'portfolio'.$env{'form.currentpath'});
- my $status =&Apache::lonnet::userfileupload($formname,'','portfolio');
if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') {
$r->print('<p><font color="red">'.
&mt('Could not write metadata').', '.