--- loncom/interface/lonmeta.pm 2005/08/09 00:24:55 1.104 +++ 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.104 2005/08/09 00:24:55 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,30 +292,37 @@ sub fieldnames { sub select_course { my ($r)=@_; - $r->print('

Instructor Selected Meta-Data


'); + 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 your course
'); + $r->print('Select your test course
'); $r->print(''); - } - my $course_key = $key; - $course_key =~ s/\.metadata\..*//; - $r->print(''); + foreach my $key (keys (%courses)) { + if ($meta_not_found) { + undef($meta_not_found); + $r->print('

Portfolio Meta-Data


'); + $r->print(''); + $r->print('Select your course
'); + $r->print('
'); - $r->print(''); + $r->print(''); $r->print('
'); } return 'ok'; @@ -470,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 (''); + } + 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, @@ -575,19 +635,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)); - if ($env{'form.metacourse'}) { - &present_instructor_metadata($r,$uri,'portfolio'); - } - elsif ($env{'form.keywords'}) { - &save_instructor_metadata($r); - &select_course($r); - } else { - &present_editable_metadata($r,$uri,'portfolio'); - &select_course($r); - } - + &present_editable_metadata($r,$uri,'portfolio'); + &select_course($r); } elsif ($uri=~/^\/\~/) { # Construction space $r->print(&Apache::loncommon::bodytag @@ -921,30 +974,7 @@ sub print_dynamic_metadata { $r->print(""); return; } -sub save_instructor_metadata { - my ($r) = @_; - $r->print('This is the save instructor metadata area
'); - my @words = &Apache::loncommon::get_env_multiple('form.keywords'); - foreach my $word (@words) { - $r->print('You entered:'.$word.'
'); - } - return 'ok'; -} -sub present_instructor_metadata { - my ($r,$uri, $file_type) = @_; - $r->print('This is the instructor metadata area
'); - my @keywords = sort(split /, /,$env{$env{'form.metacourse'}.'.metadata.keywords'}); - $r->print($env{'form.metacourse'}.'
'); - $r->print('
'); - $r->print(''); - $r->print('
'); - $r->print('
'); - return 'ok'; -} + ##################################################### @@ -962,6 +992,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$//; @@ -1015,7 +1046,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); } @@ -1031,7 +1062,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', @@ -1039,24 +1070,54 @@ 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_'.$_}; + join(',',&Apache::loncommon::get_env_multiple('form.new_'.$_)); } - if (! $Apache::lonpublisher::metadatafields{'copyright'}) { - $Apache::lonpublisher::metadatafields{'copyright'}= - 'default'; - } - $output.=('

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

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

'); + } + } else { + $output.=('

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

'); + } } 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=$_; @@ -1086,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('

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