--- loncom/interface/lonmeta.pm 2005/11/07 23:03:17 1.123
+++ loncom/interface/lonmeta.pm 2005/11/22 23:20:40 1.133
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.123 2005/11/07 23:03:17 banghart Exp $
+# $Id: lonmeta.pm,v 1.133 2005/11/22 23:20:40 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -243,6 +243,7 @@ sub fieldnames {
'authorspace' => 'Author Space',
'modifyinguser' => 'Last Modifying User',
'subject' => 'Subject',
+ 'standards' => 'Standards',
'keywords' => 'Keyword(s)',
'notes' => 'Notes',
'abstract' => 'Abstract',
@@ -254,7 +255,6 @@ sub fieldnames {
%fields =
(%fields,
'domain' => 'Domain',
- 'standards' => 'Standards',
'mime' => 'MIME Type',
'language' => 'Language',
'creationdate' => 'Creation Date',
@@ -284,7 +284,7 @@ sub fieldnames {
'stdno' => 'Total number of students who have worked on this problem',
'difficulty' => 'Degree of difficulty',
'disc' => 'Degree of discrimination',
- 'dependencies' => 'Resources used by this resource',
+ 'dependencies' => 'Resources used by this resource',
);
}
return &Apache::lonlocal::texthash(%fields);
@@ -304,7 +304,7 @@ sub select_course {
}
$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 course restrictions<br />');
$r->print('<select name="metacourse" >');
my $meta_not_found = 1;
foreach my $key (keys (%courses)) {
@@ -483,50 +483,59 @@ sub prettyinput {
if (! defined($size)) {
$size = 80;
}
+ my $output;
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/) {
+ my %meta_options;
+ my @cur_values_inst;
+ my $cur_values_stu;
+ my $values = $env{$course_key.'.metadata.'.$type.'.values'};
+ if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/stuadd/) {
$stu_add = 'true';
}
- if ($env{$course_key.'.metadata.'.$_.'.options'} =~ m/onlyone/) {
+ if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/onlyone/) {
$only_one = 'true';
}
- if ($type eq 'author') {
+ # need to take instructor values out of list where instructor and student
+ # values may be mixed.
+ if ($values) {
+ foreach my $item (split(/,/,$values)) {
+ $item =~ s/^\s+//;
+ $meta_options{$item} = $item;
+ }
+ foreach my $item (split(/,/,$value)) {
+ $item =~ s/^\s+//;
+ if ($meta_options{$item}) {
+ push(@cur_values_inst,$item);
+ } else {
+ $cur_values_stu .= $item.',';
+ }
+ }
+ } else {
+ $cur_values_stu = $value;
}
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 (($type eq 'keywords') || ($type eq 'subject')
+ || ($type eq 'author')||($type eq 'notes')
+ || ($type eq 'abstract')|| ($type eq 'title')|| ($type eq 'standards')) {
+ if ($values) {
+ if ($only_one) {
+ $output .= (&Apache::loncommon::select_form($value,'new_'.$type,%meta_options));
+ } else {
+ $output .= (&Apache::loncommon::multiple_select_form('new_'.$type,\@cur_values_inst,undef,\%meta_options));
+ }
}
- 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 ($stu_add) {
+ $output .= '<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
+ 'value="'.$cur_values_stu.'" />'.
+ &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,
+ $relatedvalue);
}
+ return ($output);
}
- if ($type eq 'notes') {
- }
- if ($type eq 'abstract') {
- }
-
if (($type eq 'lowestgradelevel') ||
($type eq 'highestgradelevel')) {
return &Apache::loncommon::select_level_form($value,$fieldname).
@@ -1062,7 +1071,7 @@ ENDEDIT
my @fields;
if ($file_type eq 'portfolio') {
@fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
- 'highestgradelevel','courserestricted');
+ 'highestgradelevel','standards','courserestricted');
} else {
@fields = ('author','title','subject','keywords','abstract','notes',
'copyright','customdistributionfile','language',
@@ -1087,25 +1096,39 @@ ENDEDIT
$Apache::lonpublisher::metadatafields{'copyright'}=
'default';
}
- foreach (@fields) {
- if (defined($env{'form.new_'.$_})) {
- $Apache::lonpublisher::metadatafields{$_}=
- join(',',&Apache::loncommon::get_env_multiple('form.new_'.$_));
+ if ($metacourse ne 'none') {
+ $r->print('Document metadata restricted by :<strong> '.$env{$metacourse.".description"}."</strong><br />");
+ }
+ 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 ($metacourse ne 'none') {
# handle restrictions here
- if (($env{$metacourse.'.metadata.'.$_.'.options'} =~ m/active/)||
- ($_ eq 'courserestricted')) {
- $output.=('<p>'.$lt{$_}.': '.
- &prettyinput($_,
- $Apache::lonpublisher::metadatafields{$_},
- 'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
- }
+ if ($env{$metacourse.'.metadata.'.$field_name.'.options'} =~ m/active/){
+ $output.=('<p>'.$lt{$field_name}.': '.
+ &prettyinput($field_name,
+ $Apache::lonpublisher::metadatafields{$field_name},
+ 'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
+ } elsif ($field_name eq 'courserestricted') {
+ $output.=(
+ &prettyinput($field_name,
+ $Apache::lonpublisher::metadatafields{$field_name},
+ 'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse));
+ }
} else {
- $output.=('<p>'.$lt{$_}.': '.
- &prettyinput($_,
- $Apache::lonpublisher::metadatafields{$_},
- 'new_'.$_,'defaultmeta').'</p>');
+ if ($field_name ne 'courserestricted') {
+ $output.=('<p>'.$lt{$field_name}.': '.
+ &prettyinput($field_name,
+ $Apache::lonpublisher::metadatafields{$field_name},
+ 'new_'.$field_name,'defaultmeta').'</p>');
+ } else {
+ $output.=&prettyinput($field_name,
+ $Apache::lonpublisher::metadatafields{$field_name},
+ 'new_'.$field_name,'defaultmeta');
+ }
}
}
if ($env{'form.store'}) {