--- loncom/interface/lonmeta.pm 2005/11/15 19:20:12 1.127 +++ 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.127 2005/11/15 19:20:12 banghart Exp $ +# $Id: lonmeta.pm,v 1.136 2005/12/09 23:49:45 albertel 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); @@ -302,9 +302,9 @@ sub select_course { $courses{$coursekey} = $value; } } - $r->print('

Course Related Meta-Data


'); + $r->print('

Associate resource with a course


'); $r->print('
'); - $r->print('Select course restrictions
'); + $r->print('Select course
'); $r->print('
'); - $r->print(''); + $r->print(''); $r->print('
'); } return 'ok'; @@ -483,55 +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') { - return - ''. - &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname, - $relatedvalue); - + # 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 'authorspace') { - } - if ($type eq 'modifyinguser') { - } - if ($type eq 'subject') { - } - if ($type eq 'keywords') { - my %hash; - 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($cur_values_inst[0],'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($value,'new_keywords',%hash)); - } else { - return (&Apache::loncommon::multiple_select_form('new_keywords',\@cur_values,undef,\%hash)); + if ($stu_add) { + $output .= ''. + &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). @@ -599,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')) { @@ -1067,7 +1075,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', @@ -1093,46 +1101,40 @@ ENDEDIT 'default'; } if ($metacourse ne 'none') { - $r->print('Document metadata restricted by : '.$env{$metacourse.".description"}."
"); + $r->print('Using: '.$env{$metacourse.".description"}." metadata framework
"); } - - foreach (@fields) { - if (defined($env{'form.new_'.$_})) { - $Apache::lonpublisher::metadatafields{$_}= - join(',',&Apache::loncommon::get_env_multiple('form.new_'.$_)); + 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)); } - 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') { + 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{$_}, + $Apache::lonpublisher::metadatafields{$field_name}, 'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse)); } } else { - if ($_ ne 'courserestricted') { - $output.=('

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

'); + 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{$_}, + $Apache::lonpublisher::metadatafields{$field_name}, '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'; @@ -1154,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.'"'; @@ -1168,7 +1170,7 @@ 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'});