--- loncom/interface/lonmeta.pm 2005/07/13 22:09:11 1.99 +++ loncom/interface/lonmeta.pm 2005/11/19 22:47:07 1.131 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.99 2005/07/13 22:09:11 www Exp $ +# $Id: lonmeta.pm,v 1.131 2005/11/19 22:47:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -17,7 +17,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU General Public License # along with LON-CAPA; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # @@ -33,7 +33,7 @@ use LONCAPA::lonmetadata(); use Apache::Constants qw(:common); use Apache::lonnet; use Apache::loncommon(); -use Apache::lonhtmlcommon(); +use Apache::lonhtmlcommon(); use Apache::lonmsg; use Apache::lonpublisher; use Apache::lonlocal; @@ -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, @@ -288,6 +290,43 @@ sub fieldnames { return &Apache::lonlocal::texthash(%fields); } +sub select_course { + my ($r)=@_; + my %courses; + 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; + } + } + $r->print('

Course Related Meta-Data


'); + $r->print('
'); + $r->print('Select course restrictions
'); + $r->print(''); + } + $key =~ m/(^.+)\.description$/; + $r->print(''); + } + unless ($meta_not_found) { + $r->print('
'); + $r->print(''); + $r->print('
'); + } + return 'ok'; +} # Pretty printing of metadata field sub prettyprint { @@ -440,10 +479,70 @@ sub relatedfield { sub prettyinput { my ($type,$value,$fieldname,$formname, - $relatedsearchflag,$relatedsep,$relatedvalue,$size)=@_; + $relatedsearchflag,$relatedsep,$relatedvalue,$size,$course_key)=@_; if (! defined($size)) { $size = 80; } + my $output; + if (defined($course_key)) { + my $stu_add; + my $only_one; + my %meta_options; + my @cur_values_inst; + my $cur_values_stu; + 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'; + } + # need to take instructor values out of list where instructor and student + # values may be mixed. + if ($values && $stu_add) { + foreach (split(/,/,$values)) { + $_ =~ s/^\s+//; + $meta_options{$_} = $_; + } + foreach (split(/,/,$value)) { + $_ =~ s/^\s+//; + if ($meta_options{$_}) { + push(@cur_values_inst,$_); + } else { + $cur_values_stu .= $_.','; + } + } + } else { + $cur_values_stu = $value; + } + if ($type eq 'courserestricted') { + return (''); + } + if (($type eq 'keywords') || ($type eq 'subject') + || ($type eq 'author')||($type eq 'notes') + || ($type eq 'abstract')|| ($type eq 'title')) { + 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 ($stu_add) { + $output .= ''. + &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname, + $relatedvalue); + } + return ($output); + } + 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, @@ -545,10 +644,12 @@ sub handler { # Looking for all bombs? &report_bombs($r,$uri); } elsif ($uri=~/\/portfolio\//) { + ($resdomain,$resuser)= + (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|); $r->print(&Apache::loncommon::bodytag ('Edit Portfolio File Information','','','',$resdomain)); &present_editable_metadata($r,$uri,'portfolio'); - + &select_course($r); } elsif ($uri=~/^\/\~/) { # Construction space $r->print(&Apache::loncommon::bodytag @@ -883,6 +984,8 @@ sub print_dynamic_metadata { return; } + + ##################################################### ##################################################### ### ### @@ -898,6 +1001,7 @@ sub present_editable_metadata { my $fn=&Apache::lonnet::filelocation('',$uri); $disuri=~s/^\/\~/\/priv\//; $disuri=~s/\.meta$//; + $disuri=~s|^/editupload||; my $target=$uri; $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//; $target=~s/\.meta$//; @@ -951,7 +1055,7 @@ ENDDEL %Apache::lonpublisher::metadatakeys=(); my $result=&Apache::lonnet::getfile($fn); if ($result == -1){ - $r->print('Creating new '.$fn); + $r->print('Creating new '.$disuri); } else { &Apache::lonpublisher::metaeval($result); } @@ -967,7 +1071,7 @@ ENDEDIT my @fields; if ($file_type eq 'portfolio') { @fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel', - 'highestgradelevel'); + 'highestgradelevel','courserestricted'); } else { @fields = ('author','title','subject','keywords','abstract','notes', 'copyright','customdistributionfile','language', @@ -975,24 +1079,74 @@ 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'; + } + if ($metacourse ne 'none') { + $r->print('Document metadata restricted by : '.$env{$metacourse.".description"}."
"); + } + foreach (@fields) { if (defined($env{'form.new_'.$_})) { $Apache::lonpublisher::metadatafields{$_}= - $env{'form.new_'.$_}; + join(',',&Apache::loncommon::get_env_multiple('form.new_'.$_)); } - if (! $Apache::lonpublisher::metadatafields{'copyright'}) { - $Apache::lonpublisher::metadatafields{'copyright'}= - 'default'; - } - $output.=('

'.$lt{$_}.': '. - &prettyinput($_, + my $field_name = $_; + if ($metacourse ne 'none') { + # handle restrictions here + if ($env{$metacourse.'.metadata.'.$_.'.options'} =~ m/active/){ + $output.=('

'.$lt{$_}.': '. + &prettyinput($_, + $Apache::lonpublisher::metadatafields{$_}, + 'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'

'); + } elsif ($_ eq 'courserestricted') { + $output.=( + &prettyinput($field_name, + $Apache::lonpublisher::metadatafields{$_}, + 'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse)); + } + } else { + if ($_ ne 'courserestricted') { + $output.=('

'.$lt{$_}.': '. + &prettyinput($_, $Apache::lonpublisher::metadatafields{$_}, 'new_'.$_,'defaultmeta').'

'); + } else { + $output.=&prettyinput($field_name, + $Apache::lonpublisher::metadatafields{$_}, + 'new_'.$field_name,'defaultmeta'); + } + } } + $output.=('

'.$lt{$_}.': '. + &prettyinput($_, + $Apache::lonpublisher::metadatafields{$_}, + 'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'

'); + if ($env{'form.store'}) { my $mfh; - my $formname='store'; + my $formname='store'; my $file_content; + foreach my $meta_field (keys %env) { + 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) { next if ($_ =~ /\./); my $unikey=$_; @@ -1022,7 +1176,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('

'. &mt('Could not write metadata').', '.