--- loncom/interface/lonmeta.pm 2005/10/19 21:53:16 1.114
+++ loncom/interface/lonmeta.pm 2005/12/14 00:12:13 1.138
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.114 2005/10/19 21:53:16 banghart Exp $
+# $Id: lonmeta.pm,v 1.138 2005/12/14 00:12:13 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -237,52 +237,24 @@ sub diffgraph {
# The field names
sub fieldnames {
my $file_type=shift;
- my %fields;
- %fields =
- (%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',
+ my %fields =
+ ('title' => 'Title',
'author' =>'Author(s)',
'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');
- }
- 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');
- }
+ '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',
@@ -312,15 +284,16 @@ 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);
}
sub select_course {
- my ($r)=@_;
my %courses;
+ my $output;
+ my $selected;
foreach my $key (keys (%env)) {
if ($key =~ m/\.metadata\./) {
$key =~ m/^course\.(.+)(\.metadata.+$)/;
@@ -330,29 +303,27 @@ sub select_course {
$courses{$coursekey} = $value;
}
}
- $r->print('<h3>Course Related Meta-Data</h3><br />');
- $r->print('<form action="" method="post">');
- $r->print('Select your test course<br />');
- $r->print('<select name="metacourse" >');
my $meta_not_found = 1;
+ if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq 'none') {
+ $selected = ' SELECTED ';
+ } else {
+ $selected = '';
+ }
+ $output .= '<select name="new_courserestricted" >';
+ $output .= '<option value="none" '.$selected.'>None</option>';
foreach my $key (keys (%courses)) {
- if ($meta_not_found) {
- undef($meta_not_found);
- $r->print('<h3>Portfolio Meta-Data</h3><br />');
- $r->print('<form action="" method="post">');
- $r->print('Select your course<br />');
- $r->print('<select name="metacourse" >');
- }
- $r->print('<option value="'.$key.'">');
- $r->print($courses{$key});
- $r->print('</option>');
- }
- unless ($meta_not_found) {
- $r->print('</select><br />');
- $r->print('<input type="submit" value="Assign Portfolio Metadata" />');
- $r->print('</form>');
+ $key =~ m/(^.+)\.description$/;
+ if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq $1) {
+ $selected = ' SELECTED ';
+ } else {
+ $selected = '';
+ }
+ $output .= '<option value="'.$1.'"'.$selected.'>';
+ $output .= $courses{$key};
+ $output .= '</option>';
}
- return 'ok';
+ $output .= '</select><br />';
+ return ($output);
}
# Pretty printing of metadata field
@@ -506,10 +477,71 @@ 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 (&select_course());
+ # return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+ }
+ 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 .= '<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
+ 'value="'.$cur_values_stu.'" />'.
+ &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,
@@ -570,6 +602,11 @@ sub prettyinput {
",'rights')\">".&mt('Select').'</a>'.
&relatedfield(0,$relatedsearchflag,$relatedsep);
}
+ if ($type eq 'courserestricted') {
+ return (&select_course());
+ #return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+ }
+
# Dates
if (($type eq 'creationdate') ||
($type eq 'lastrevisiondate')) {
@@ -616,7 +653,6 @@ sub handler {
$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
@@ -1010,74 +1046,14 @@ ENDDEL
}
$r->print('<br />'.$bombs);
} else {
- my $displayfile='Catalog Information for '.$disuri;
- if ($disuri=~/\/default$/) {
- my $dir=$disuri;
- $dir=~s/default$//;
- $displayfile=
- &mt('Default Cataloging Information for Directory').' '.
- $dir;
- }
- %Apache::lonpublisher::metadatafields=();
- %Apache::lonpublisher::metadatakeys=();
- my $result=&Apache::lonnet::getfile($fn);
- if ($result == -1){
- $r->print('Creating new '.$disuri);
- } else {
- &Apache::lonpublisher::metaeval($result);
- }
- $r->print(<<ENDEDIT);
-<h1>$displayfile</h1>
-<form method="post" name="defaultmeta">
-ENDEDIT
- $r->print('<script language="JavaScript">'.
- &Apache::loncommon::browser_and_searcher_javascript().
- '</script>');
- if (($file_type eq 'portfolio') && $env{'form.metacourse'}) {
- $file_type = 'restrictedportfolio';
- }
- my %lt=&fieldnames($file_type);
- my $output;
- my @fields;
- if ($file_type eq 'portfolio') {
- @fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
- 'highestgradelevel');
- } elsif ($file_type eq 'restrictedportfolio') {
- @fields = ('metadata.author','metadata.title','metadata.subject','metadata.keywords','metadata.abstract','metadata.notes','metadata.lowestgradelevel',
- 'metadata.highestgradelevel');
- } else {
- @fields = ('author','title','subject','keywords','abstract','notes',
- 'copyright','customdistributionfile','language',
- 'standards',
- 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
- 'obsolete','obsoletereplacement');
- }
- foreach (@fields) {
- if (defined($env{'form.new_'.$_})) {
- $Apache::lonpublisher::metadatafields{$_}=
- $env{'form.new_'.$_};
- }
- if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
- $Apache::lonpublisher::metadatafields{'copyright'}=
- 'default';
- }
- $output.=('<p>'.$lt{$_}.': '.
- &prettyinput($_,
- $Apache::lonpublisher::metadatafields{$_},
- 'new_'.$_,'defaultmeta').'</p>');
-
- }
if ($env{'form.store'}) {
my $mfh;
my $formname='store';
my $file_content;
foreach my $meta_field (keys %env) {
- if ($meta_field=~m/^form.instmeta_(.+)_(\d+)$/) {
- $r->print('Found a field<br>');
- }
- 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) {
@@ -1091,7 +1067,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.'"';
@@ -1105,11 +1081,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('<p><font color="red">'.
&mt('Could not write metadata').', '.
@@ -1131,9 +1106,87 @@ ENDEDIT
'</font></p>');
}
}
+ }
+ my $displayfile='Catalog Information for '.$disuri;
+ if ($disuri=~/\/default$/) {
+ my $dir=$disuri;
+ $dir=~s/default$//;
+ $displayfile=
+ &mt('Default Cataloging Information for Directory').' '.
+ $dir;
+ }
+ %Apache::lonpublisher::metadatafields=();
+ %Apache::lonpublisher::metadatakeys=();
+ my $result=&Apache::lonnet::getfile($fn);
+ if ($result == -1){
+ $r->print('Creating new '.$disuri);
+ } else {
+ &Apache::lonpublisher::metaeval($result);
}
- $r->print($output.'<br /><input type="submit" name="store" value="'.
+ $r->print(<<ENDEDIT);
+<h1>$displayfile</h1>
+<form method="post" name="defaultmeta">
+ENDEDIT
+ $r->print('<script language="JavaScript">'.
+ &Apache::loncommon::browser_and_searcher_javascript().
+ '</script>');
+ my %lt=&fieldnames($file_type);
+ my $output;
+ my @fields;
+ if ($file_type eq 'portfolio') {
+ @fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
+ 'highestgradelevel','standards','courserestricted');
+ } else {
+ @fields = ('author','title','subject','keywords','abstract','notes',
+ 'copyright','customdistributionfile','language',
+ 'standards',
+ 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
+ 'obsolete','obsoletereplacement');
+ }
+ if (! $Apache::lonpublisher::metadatafields{'courserestricted'}) {
+ $Apache::lonpublisher::metadatafields{'courserestricted'}=
+ 'none';
+ }
+ if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
+ $Apache::lonpublisher::metadatafields{'copyright'}=
+ 'default';
+ }
+ if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
+ $r->print('Using: <strong> '.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
+ "</strong> metadata framework<br />");
+ } else {
+ $r->print("This resource is not associated with a metadata framework<br />");
+ }
+ 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));
+ }
+ if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
+ # handle restrictions here
+ if (($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
+ ($field_name eq 'courserestricted')){
+ $output.=('<p>'.$lt{$field_name}.': '.
+ &prettyinput($field_name,
+ $Apache::lonpublisher::metadatafields{$field_name},
+ 'new_'.$field_name,'defaultmeta',
+ undef,undef,undef,undef,
+ $Apache::lonpublisher::metadatafields{'courserestricted'}).'</p>');
+ }
+ } else {
+
+ $output.=('<p>'.$lt{$field_name}.': '.
+ &prettyinput($field_name,
+ $Apache::lonpublisher::metadatafields{$field_name},
+ 'new_'.$field_name,'defaultmeta').'</p>');
+
+ }
+ }
+
+ $r->print($output.'<br /><input type="submit" name="store" value="'.
&mt('Store Catalog Information').'">');
+
}
$r->print('</form>');
return;