--- loncom/interface/lonmeta.pm 2005/03/17 21:32:17 1.94 +++ loncom/interface/lonmeta.pm 2005/10/31 21:11:45 1.121 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.94 2005/03/17 21:32:17 banghart Exp $ +# $Id: lonmeta.pm,v 1.121 2005/10/31 21:11:45 banghart 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 # @@ -31,9 +31,9 @@ package Apache::lonmeta; use strict; use LONCAPA::lonmetadata(); use Apache::Constants qw(:common); -use Apache::lonnet(); +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 your test course
'); + $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 { @@ -338,7 +377,7 @@ sub prettyprint { return &Apache::loncommon::gradeleveldescription($value); } # Only for advance users below - if (! $ENV{'user.adv'}) { + if (! $env{'user.adv'}) { return '- '.&mt('not displayed').' -'; } # File @@ -440,10 +479,55 @@ 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; + foreach (split(/,/,$values)) { + $hash{$_} = $_; + } + if ($only_one) { + return(&Apache::loncommon::select_form($def,'new_keywords',%hash)); + } else { + return(&Apache::loncommon::multiple_select_form('new_keywords',undef,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, @@ -545,10 +629,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 @@ -578,6 +664,15 @@ sub report_bombs { $r->print('

'.&Apache::lonnet::clutter($uri).'

'); my ($domain,$author)=($uri=~/^(\w+)\/(\w+)\//); if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) { + if ($env{'form.clearbombs'}) { + &Apache::lonmsg::clear_author_res_msg($uri); + } + my $clear=&mt('Clear all Messages in Subdirectory'); + $r->print(< + + +ENDCLEAR my %brokenurls = &Apache::lonmsg::all_url_author_res_msg($author,$domain); foreach (sort(keys(%brokenurls))) { @@ -632,7 +727,7 @@ sub present_uneditable_metadata { # obsolete my $obsolete=$content{'obsolete'}; my $obsoletewarning=''; - if (($obsolete) && ($ENV{'user.adv'})) { + if (($obsolete) && ($env{'user.adv'})) { $obsoletewarning='

'. &mt('This resource has been marked obsolete by the author(s)'). '

'; @@ -681,7 +776,7 @@ $versiondisplay $table ENDHEAD - if ($ENV{'user.adv'}) { + if ($env{'user.adv'}) { &print_dynamic_metadata($r,$uri,\%content); } return; @@ -822,8 +917,8 @@ sub print_dynamic_metadata { $r->print('

'.&mt('No Evaluation Data is available for this resource.').'

'); } $uri=~/^\/res\/(\w+)\/(\w+)\//; - if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2)) - || ($ENV{'user.role.ca./'.$1.'/'.$2})) { + if ((($env{'user.domain'} eq $1) && ($env{'user.name'} eq $2)) + || ($env{'user.role.ca./'.$1.'/'.$2})) { if (exists($dynmeta{'comments'})) { $r->print('

'.&mt('Evaluation Comments').' ('. &mt('visible to author and co-authors only'). @@ -874,6 +969,8 @@ sub print_dynamic_metadata { return; } + + ##################################################### ##################################################### ### ### @@ -889,25 +986,47 @@ 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/^\/\~/\/res\/$env{'request.role.domain'}\//; $target=~s/\.meta$//; my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target); if ($bombs) { - if ($ENV{'form.delmsg'}) { + my $showdel=1; + if ($env{'form.delmsg'}) { if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') { $bombs=&mt('Messages deleted.'); + $showdel=0; } else { $bombs=&mt('Error deleting messages'); } } - my $del=&mt('Delete Messages'); + if ($env{'form.clearmsg'}) { + my $cleardir=$target; + $cleardir=~s/\/[^\/]+$/\//; + if (&Apache::lonmsg::clear_author_res_msg($cleardir) eq 'ok') { + $bombs=&mt('Messages cleared.'); + $showdel=0; + } else { + $bombs=&mt('Error clearing messages'); + } + } + my $del=&mt('Delete Messages for this Resource'); + my $clear=&mt('Clear all Messages in Subdirectory'); + my $goback=&mt('Back to Source File'); $r->print(<$disuri

- -
$bombs ENDBOMBS + if ($showdel) { + $r->print(< + +ENDDEL + } else { + $r->print(''.$goback.''); + } + $r->print('
'.$bombs); } else { my $displayfile='Catalog Information for '.$disuri; if ($disuri=~/\/default$/) { @@ -921,8 +1040,7 @@ ENDBOMBS %Apache::lonpublisher::metadatakeys=(); my $result=&Apache::lonnet::getfile($fn); if ($result == -1){ - $r->print('Unable to get '.$fn); - return ; + $r->print('Creating new '.$disuri); } else { &Apache::lonpublisher::metaeval($result); } @@ -938,7 +1056,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', @@ -946,24 +1064,55 @@ ENDEDIT 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights', 'obsolete','obsoletereplacement'); } - foreach (@fields) { - if (defined($ENV{'form.new_'.$_})) { - $Apache::lonpublisher::metadatafields{$_}= - $ENV{'form.new_'.$_}; + 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'}) { + } + if (! $Apache::lonpublisher::metadatafields{'copyright'}) { $Apache::lonpublisher::metadatafields{'copyright'}= - 'default'; + 'default'; + } + &Apache::lonnet::logthis($metacourse.' is the restriction'); + foreach (@fields) { + if (defined($env{'form.new_'.$_})) { + $Apache::lonpublisher::metadatafields{$_}= + $env{'form.new_'.$_}; } - $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'}) { + 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.keywords')) { + $Apache::lonpublisher::metadatafields{'coursekeyword'} = + join (', ', &Apache::loncommon::get_env_multiple('form.keywords')); + } + } foreach (sort keys %Apache::lonpublisher::metadatafields) { next if ($_ =~ /\./); my $unikey=$_; @@ -989,11 +1138,10 @@ ENDEDIT if ($fn =~ /\/portfolio\//) { $fn =~ /\/portfolio\/(.*)$/; my $new_fn = '/'.$1; - $ENV{'form.'.$formname}=$file_content; - $ENV{'form.'.$formname.'.filename'}=$new_fn; + $env{'form.'.$formname}=$file_content; + $env{'form.'.$formname.'.filename'}=$new_fn; &Apache::lonnet::userfileupload('uploaddoc','', - 'portfolio'.$ENV{'form.currentpath'}); - my $status =&Apache::lonnet::userfileupload($formname,'','portfolio'); + 'portfolio'.$env{'form.currentpath'}); if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') { $r->print('

'. &mt('Could not write metadata').', '. @@ -1010,6 +1158,9 @@ ENDEDIT &mt('FAIL').'

'); } else { print $mfh $file_content; + $r->print('

'.&mt('Wrote Metadata'). + ' '.&Apache::lonlocal::locallocaltime(time). + '

'); } } } @@ -1022,3 +1173,5 @@ ENDEDIT 1; __END__ + +