version 1.114, 2005/10/19 21:53:16
|
version 1.126, 2005/11/11 22:46:56
|
Line 237 sub diffgraph {
|
Line 237 sub diffgraph {
|
# The field names |
# The field names |
sub fieldnames { |
sub fieldnames { |
my $file_type=shift; |
my $file_type=shift; |
my %fields; |
my %fields = |
%fields = |
('title' => 'Title', |
(%fields, |
|
'title' => 'Title', |
|
'author' =>'Author(s)', |
|
'authorspace' => 'Author Space', |
|
'modifyinguser' => 'Last Modifying User', |
|
'subject' => 'Subject', |
|
'keywords' => 'Keyword(s)', |
|
'notes' => 'Notes', |
|
'abstract' => 'Abstract', |
|
'lowestgradelevel' => 'Lowest Grade Level', |
|
'highestgradelevel' => 'Highest Grade Level'); |
|
if ($file_type eq 'portfolio') { |
|
%fields = |
|
(%fields, |
|
'title' => 'Title', |
|
'author' =>'Author(s)', |
'author' =>'Author(s)', |
'authorspace' => 'Author Space', |
'authorspace' => 'Author Space', |
'modifyinguser' => 'Last Modifying User', |
'modifyinguser' => 'Last Modifying User', |
Line 262 sub fieldnames {
|
Line 247 sub fieldnames {
|
'notes' => 'Notes', |
'notes' => 'Notes', |
'abstract' => 'Abstract', |
'abstract' => 'Abstract', |
'lowestgradelevel' => 'Lowest Grade Level', |
'lowestgradelevel' => 'Lowest Grade Level', |
'highestgradelevel' => 'Highest Grade Level'); |
'highestgradelevel' => 'Highest Grade Level', |
} |
'courserestricted' => 'Course Restricting Metadata'); |
if ($file_type eq 'restrictedportfolio') { |
|
%fields = |
|
(%fields, |
|
'metadata.title' => 'Title', |
|
'metadata.author' =>'Author(s)', |
|
'metadata.authorspace' => 'Author Space', |
|
'metadata.modifyinguser' => 'Last Modifying User', |
|
'metadata.subject' => 'Subject', |
|
'metadata.keywords' => 'Keyword(s)', |
|
'metadata.notes' => 'Notes', |
|
'metadata.abstract' => 'Abstract', |
|
'metadata.lowestgradelevel' => 'Lowest Grade Level', |
|
'metadata.highestgradelevel' => 'Highest Grade Level'); |
|
} |
|
if (! defined($file_type) || $file_type ne 'portfolio') { |
if (! defined($file_type) || $file_type ne 'portfolio') { |
%fields = |
%fields = |
(%fields, |
(%fields, |
Line 332 sub select_course {
|
Line 304 sub select_course {
|
} |
} |
$r->print('<h3>Course Related Meta-Data</h3><br />'); |
$r->print('<h3>Course Related Meta-Data</h3><br />'); |
$r->print('<form action="" method="post">'); |
$r->print('<form action="" method="post">'); |
$r->print('Select your test course<br />'); |
$r->print('Select course restrictions<br />'); |
$r->print('<select name="metacourse" >'); |
$r->print('<select name="metacourse" >'); |
my $meta_not_found = 1; |
my $meta_not_found = 1; |
foreach my $key (keys (%courses)) { |
foreach my $key (keys (%courses)) { |
Line 343 sub select_course {
|
Line 315 sub select_course {
|
$r->print('Select your course<br />'); |
$r->print('Select your course<br />'); |
$r->print('<select name="metacourse" >'); |
$r->print('<select name="metacourse" >'); |
} |
} |
$r->print('<option value="'.$key.'">'); |
$key =~ m/(^.+)\.description$/; |
|
$r->print('<option value="'.$1.'">'); |
$r->print($courses{$key}); |
$r->print($courses{$key}); |
$r->print('</option>'); |
$r->print('</option>'); |
} |
} |
Line 506 sub relatedfield {
|
Line 479 sub relatedfield {
|
|
|
sub prettyinput { |
sub prettyinput { |
my ($type,$value,$fieldname,$formname, |
my ($type,$value,$fieldname,$formname, |
$relatedsearchflag,$relatedsep,$relatedvalue,$size)=@_; |
$relatedsearchflag,$relatedsep,$relatedvalue,$size,$course_key)=@_; |
if (! defined($size)) { |
if (! defined($size)) { |
$size = 80; |
$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') { |
|
return |
|
'<input type="text" name="'.$fieldname.'" size="'.$size.'" '. |
|
'value="'.$value.'" />'. |
|
&relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname, |
|
$relatedvalue); |
|
|
|
} |
|
if ($type eq 'courserestricted') { |
|
return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />'); |
|
} |
|
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 ($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 ($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 |
# Language |
if ($type eq 'language') { |
if ($type eq 'language') { |
return &selectbox($fieldname, |
return &selectbox($fieldname, |
Line 1033 ENDEDIT
|
Line 1062 ENDEDIT
|
$r->print('<script language="JavaScript">'. |
$r->print('<script language="JavaScript">'. |
&Apache::loncommon::browser_and_searcher_javascript(). |
&Apache::loncommon::browser_and_searcher_javascript(). |
'</script>'); |
'</script>'); |
if (($file_type eq 'portfolio') && $env{'form.metacourse'}) { |
|
$file_type = 'restrictedportfolio'; |
|
} |
|
my %lt=&fieldnames($file_type); |
my %lt=&fieldnames($file_type); |
my $output; |
my $output; |
my @fields; |
my @fields; |
if ($file_type eq 'portfolio') { |
if ($file_type eq 'portfolio') { |
@fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel', |
@fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel', |
'highestgradelevel'); |
'highestgradelevel','courserestricted'); |
} elsif ($file_type eq 'restrictedportfolio') { |
|
@fields = ('metadata.author','metadata.title','metadata.subject','metadata.keywords','metadata.abstract','metadata.notes','metadata.lowestgradelevel', |
|
'metadata.highestgradelevel'); |
|
} else { |
} else { |
@fields = ('author','title','subject','keywords','abstract','notes', |
@fields = ('author','title','subject','keywords','abstract','notes', |
'copyright','customdistributionfile','language', |
'copyright','customdistributionfile','language', |
Line 1052 ENDEDIT
|
Line 1075 ENDEDIT
|
'lowestgradelevel','highestgradelevel','sourceavail','sourcerights', |
'lowestgradelevel','highestgradelevel','sourceavail','sourcerights', |
'obsolete','obsoletereplacement'); |
'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 :<strong> '.$env{$metacourse.".description"}."</strong><br />"); |
|
} |
|
|
foreach (@fields) { |
foreach (@fields) { |
if (defined($env{'form.new_'.$_})) { |
if (defined($env{'form.new_'.$_})) { |
$Apache::lonpublisher::metadatafields{$_}= |
$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.=('<p>'.$lt{$_}.': '. |
if ($metacourse ne 'none') { |
&prettyinput($_, |
# handle restrictions here |
|
if (($env{$metacourse.'.metadata.'.$_.'.options'} =~ m/active/)|| |
|
($_ eq 'courserestricted')) { |
|
$output.=('<p>'.$lt{$_}.': '. |
|
&prettyinput($_, |
|
$Apache::lonpublisher::metadatafields{$_}, |
|
'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>'); |
|
} |
|
} else { |
|
$output.=('<p>'.$lt{$_}.': '. |
|
&prettyinput($_, |
$Apache::lonpublisher::metadatafields{$_}, |
$Apache::lonpublisher::metadatafields{$_}, |
'new_'.$_,'defaultmeta').'</p>'); |
'new_'.$_,'defaultmeta').'</p>'); |
|
} |
} |
} |
if ($env{'form.store'}) { |
if ($env{'form.store'}) { |
my $mfh; |
my $mfh; |
my $formname='store'; |
my $formname='store'; |
my $file_content; |
my $file_content; |
foreach my $meta_field (keys %env) { |
foreach my $meta_field (keys %env) { |
if ($meta_field=~m/^form.instmeta_(.+)_(\d+)$/) { |
if (&Apache::loncommon::get_env_multiple('form.new_keywords')) { |
$r->print('Found a field<br>'); |
$Apache::lonpublisher::metadatafields{'keywords'} = |
} |
join (',', &Apache::loncommon::get_env_multiple('form.new_keywords')); |
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) { |
foreach (sort keys %Apache::lonpublisher::metadatafields) { |
Line 1109 ENDEDIT
|
Line 1156 ENDEDIT
|
$env{'form.'.$formname.'.filename'}=$new_fn; |
$env{'form.'.$formname.'.filename'}=$new_fn; |
&Apache::lonnet::userfileupload('uploaddoc','', |
&Apache::lonnet::userfileupload('uploaddoc','', |
'portfolio'.$env{'form.currentpath'}); |
'portfolio'.$env{'form.currentpath'}); |
my $status =&Apache::lonnet::userfileupload($formname,'','portfolio'); |
|
if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') { |
if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') { |
$r->print('<p><font color="red">'. |
$r->print('<p><font color="red">'. |
&mt('Could not write metadata').', '. |
&mt('Could not write metadata').', '. |