--- loncom/interface/lonmeta.pm 2005/10/06 22:20:30 1.110 +++ loncom/interface/lonmeta.pm 2005/12/09 23:49:45 1.136 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.110 2005/10/06 22:20:30 albertel Exp $ +# $Id: lonmeta.pm,v 1.136 2005/12/09 23:49:45 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -243,16 +243,18 @@ sub fieldnames { 'authorspace' => 'Author Space', 'modifyinguser' => 'Last Modifying User', 'subject' => 'Subject', + 'standards' => 'Standards', 'keywords' => 'Keyword(s)', '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, 'domain' => 'Domain', - 'standards' => 'Standards', 'mime' => 'MIME Type', 'language' => 'Language', 'creationdate' => 'Creation Date', @@ -282,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); @@ -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('

Associate resource with a course


'); $r->print('
'); - $r->print('Select your course
'); + $r->print('Select 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,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.'.$type.'.values'}; + if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/stuadd/) { + $stu_add = 'true'; + } + if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/onlyone/) { + $only_one = 'true'; + } + # 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 (''); + } + 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($cur_values_inst[0],'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, @@ -534,6 +603,10 @@ sub prettyinput { ",'rights')\">".&mt('Select').''. &relatedfield(0,$relatedsearchflag,$relatedsep); } + if ($type eq 'courserestricted') { + return (''); + } + # Dates if (($type eq 'creationdate') || ($type eq 'lastrevisiondate')) { @@ -1002,7 +1075,7 @@ ENDEDIT my @fields; if ($file_type eq 'portfolio') { @fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel', - 'highestgradelevel'); + 'highestgradelevel','standards','courserestricted'); } else { @fields = ('author','title','subject','keywords','abstract','notes', 'copyright','customdistributionfile','language', @@ -1010,49 +1083,56 @@ 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'; + } + if ($metacourse ne 'none') { + $r->print('Using: '.$env{$metacourse.".description"}." metadata framework
"); + } + 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)); } - $output.=('

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

'); - if ($env{'form.metacourse'}) { - $r->print('This is the instructor metadata area
'); - # have to find all the metadata items, so we'll loop through and find them - $r->print('
'); - $r->print('The course is: '.$env{'form.metacourse'}.'
'); - 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.'
'); - $r->print($type.'
'); - - foreach my $word (@choices) { - my $checked; - if ($Apache::lonpublisher::metadatafields{'coursekeyword'}=~ m/$word/) { - $checked = 1; - } else { - undef($checked); + if ($metacourse ne 'none') { + # handle restrictions here + if ($env{$metacourse.'.metadata.'.$field_name.'.options'} =~ m/active/){ + $output.=('

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

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

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

'); + } else { + $output.=&prettyinput($field_name, + $Apache::lonpublisher::metadatafields{$field_name}, + 'new_'.$field_name,'defaultmeta'); } - $r->print(&Apache::lonhtmlcommon::checkbox('instmeta_'.$env{'form.metacourse'}.'_'.$item_num,$checked,$word).$word.'
'); - } - } - } - $r->print('
'); - $r->print('
'); - return 'ok'; } } if ($env{'form.store'}) { @@ -1060,12 +1140,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
'); - } - 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) { @@ -1079,7 +1156,7 @@ ENDEDIT $Apache::lonpublisher::metadatakeys{$unikey}) ) { my $value= - $Apache::lonpublisher::metadatafields{$unikey.'.'.$_}; + $Apache::lonpublisher::metadatafields{$unikey.'.'.$_}; $value=~s/\"/\'\'/g; $file_content.=' '.$_.'="'.$value.'"' ; # print $mfh ' '.$_.'="'.$value.'"'; @@ -1093,11 +1170,10 @@ ENDEDIT if ($fn =~ /\/portfolio\//) { $fn =~ /\/portfolio\/(.*)$/; my $new_fn = '/'.$1; - $env{'form.'.$formname}=$file_content; + $env{'form.'.$formname}=$file_content."\n"; $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').', '. 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.