--- loncom/interface/lonmeta.pm 2005/11/19 00:16:01 1.130
+++ loncom/interface/lonmeta.pm 2005/12/19 20:08:40 1.142
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.130 2005/11/19 00:16:01 banghart Exp $
+# $Id: lonmeta.pm,v 1.142 2005/12/19 20:08:40 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -240,7 +240,10 @@ sub fieldnames {
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',
@@ -252,7 +255,6 @@ sub fieldnames {
%fields =
(%fields,
'domain' => 'Domain',
- 'standards' => 'Standards',
'mime' => 'MIME Type',
'language' => 'Language',
'creationdate' => 'Creation Date',
@@ -282,15 +284,50 @@ 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 portfolio_display_uri {
+ my ($uri)=@_;
+ $uri =~ s|.*/portfolio(/.*)$|$1|;
+ my ($res_uri,$meta_uri) = ($uri,$uri);
+
+ if ($uri =~ /\.meta$/) {
+ $res_uri =~ s/\.meta//;
+ } else {
+ $meta_uri .= '.meta';
+ }
+ return ($res_uri,$meta_uri);
+}
+
+sub pre_select_course {
+ my ($r,$uri) = @_;
+ my $output;
+ my $fn=&Apache::lonnet::filelocation('',$uri);
+ my ($res_uri,$meta_uri) = &portfolio_display_uri($uri);
+ %Apache::lonpublisher::metadatafields=();
+ %Apache::lonpublisher::metadatakeys=();
+ my $result=&Apache::lonnet::getfile($fn);
+ if ($result == -1){
+ $r->print(&mt('Creating new file [_1]'),$meta_uri);
+ } else {
+ &Apache::lonpublisher::metaeval($result);
+ }
+ $r->print('<hr /><form method="post" action="" >');
+ $r->print('<p>'.&mt('If you would like to associate this resource ([_1]) with a current or previous course, please select one from the list below, otherwise select, \'None\'','<tt>'.$res_uri.'</tt>').'</p>');
+ $output = &select_course();
+ $r->print($output.'<br /><input type="submit" name="store" value="'.
+ &mt('Associate Resource With Selected Course').'">');
+ $r->print('</form>');
+ return;
+}
sub select_course {
- my ($r)=@_;
my %courses;
+ my $output;
+ my $selected;
foreach my $key (keys (%env)) {
if ($key =~ m/\.metadata\./) {
$key =~ m/^course\.(.+)(\.metadata.+$)/;
@@ -300,30 +337,28 @@ sub select_course {
$courses{$coursekey} = $value;
}
}
- $r->print('<h3>Course Related Meta-Data</h3><br />');
- $r->print('<form action="" method="post">');
- $r->print('Select course restrictions<br />');
- $r->print('<select name="metacourse" >');
+ &Apache::lonnet::logthis('the restricted is'.$Apache::lonpublisher::metadatafields{'courserestricted'});
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" >');
- }
$key =~ m/(^.+)\.description$/;
- $r->print('<option value="'.$1.'">');
- $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>');
+ 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
@@ -488,40 +523,41 @@ sub prettyinput {
my %meta_options;
my @cur_values_inst;
my $cur_values_stu;
- my $values = $env{$course_key.'.metadata.'.$_.'.values'};
- if ($env{$course_key.'.metadata.'.$_.'.options'} =~ m/stuadd/) {
+ 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';
}
# need to take instructor values out of list where instructor and student
# values may be mixed.
- if ($values && $stu_add) {
- foreach (split(/,/,$values)) {
- $_ =~ s/^\s+//;
- $meta_options{$_} = $_;
+ if ($values) {
+ foreach my $item (split(/,/,$values)) {
+ $item =~ s/^\s+//;
+ $meta_options{$item} = $item;
}
- foreach (split(/,/,$value)) {
- $_ =~ s/^\s+//;
- if ($meta_options{$_}) {
- push(@cur_values_inst,$_);
+ foreach my $item (split(/,/,$value)) {
+ $item =~ s/^\s+//;
+ if ($meta_options{$item}) {
+ push(@cur_values_inst,$item);
} else {
- $cur_values_stu .= $_.',';
+ $cur_values_stu .= $item.',';
}
}
} else {
$cur_values_stu = $value;
}
if ($type eq 'courserestricted') {
- return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+ 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 'abstract')|| ($type eq 'title')|| ($type eq 'standards')) {
if ($values) {
if ($only_one) {
- $output .= (&Apache::loncommon::select_form($value,'new_'.$type,%meta_options));
+ $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));
}
@@ -601,6 +637,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')) {
@@ -642,12 +683,15 @@ sub handler {
# Looking for all bombs?
&report_bombs($r,$uri);
} elsif ($uri=~/\/portfolio\//) {
- ($resdomain,$resuser)=
+ ($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);
+ if ($env{'form.store'}) {
+ &present_editable_metadata($r,$uri,'portfolio');
+ } else {
+ &pre_select_course($r,$uri);
+ }
} elsif ($uri=~/^\/\~/) {
# Construction space
$r->print(&Apache::loncommon::bodytag
@@ -999,7 +1043,10 @@ sub present_editable_metadata {
my $fn=&Apache::lonnet::filelocation('',$uri);
$disuri=~s/^\/\~/\/priv\//;
$disuri=~s/\.meta$//;
- $disuri=~s|^/editupload||;
+ my $meta_uri = $disuri;
+ if ($disuri =~ m|/portfolio/|) {
+ ($disuri, $meta_uri) = &portfolio_display_uri($disuri);
+ }
my $target=$uri;
$target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;
$target=~s/\.meta$//;
@@ -1053,7 +1100,7 @@ ENDDEL
%Apache::lonpublisher::metadatakeys=();
my $result=&Apache::lonnet::getfile($fn);
if ($result == -1){
- $r->print('Creating new '.$disuri);
+ $r->print(&mt('Creating new file [_1]'),$meta_uri);
} else {
&Apache::lonpublisher::metaeval($result);
}
@@ -1069,7 +1116,7 @@ ENDEDIT
my @fields;
if ($file_type eq 'portfolio') {
@fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
- 'highestgradelevel','courserestricted');
+ 'highestgradelevel','standards');
} else {
@fields = ('author','title','subject','keywords','abstract','notes',
'copyright','customdistributionfile','language',
@@ -1077,129 +1124,119 @@ ENDEDIT
'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
'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{'courserestricted'}) &&
+ (! $env{'form.new_courserestricted'})) {
+ $Apache::lonpublisher::metadatafields{'courserestricted'}=
+ 'none';
+ } elsif ($env{'form.new_courserestricted'}) {
+ $Apache::lonpublisher::metadatafields{'courserestricted'}=
+ $env{'form.new_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 />");
+ if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
+ $r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
+ '</strong>').'<br />');
+ } else {
+ $r->print("This resource is not associated with a course.<br />");
}
-
- 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') {
+ if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
# handle restrictions here
- if ($env{$metacourse.'.metadata.'.$_.'.options'} =~ m/active/){
- $output.=('<p>'.$lt{$_}.': '.
- &prettyinput($_,
- $Apache::lonpublisher::metadatafields{$_},
- 'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
- } elsif ($_ eq 'courserestricted') {
- $output.=(
- &prettyinput($field_name,
- $Apache::lonpublisher::metadatafields{$_},
- 'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse));
+ 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 {
- if ($_ ne 'courserestricted') {
- $output.=('<p>'.$lt{$_}.': '.
- &prettyinput($_,
- $Apache::lonpublisher::metadatafields{$_},
- 'new_'.$_,'defaultmeta').'</p>');
- } else {
- $output.=&prettyinput($field_name,
- $Apache::lonpublisher::metadatafields{$_},
- 'new_'.$field_name,'defaultmeta');
- }
- }
- }
- $output.=('<p>'.$lt{$_}.': '.
- &prettyinput($_,
- $Apache::lonpublisher::metadatafields{$_},
- 'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
- if ($env{'form.store'}) {
- my $mfh;
- my $formname='store';
- my $file_content;
- foreach my $meta_field (keys %env) {
- 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) {
- next if ($_ =~ /\./);
- my $unikey=$_;
- $unikey=~/^([A-Za-z]+)/;
- my $tag=$1;
- $tag=~tr/A-Z/a-z/;
- $file_content.= "\n\<$tag";
- foreach (split(/\,/,
- $Apache::lonpublisher::metadatakeys{$unikey})
- ) {
- my $value=
- $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
- $value=~s/\"/\'\'/g;
- $file_content.=' '.$_.'="'.$value.'"' ;
- # print $mfh ' '.$_.'="'.$value.'"';
- }
- $file_content.= '>'.
- &HTML::Entities::encode
- ($Apache::lonpublisher::metadatafields{$unikey},
- '<>&"').
- '</'.$tag.'>';
- }
- if ($fn =~ /\/portfolio\//) {
- $fn =~ /\/portfolio\/(.*)$/;
- my $new_fn = '/'.$1;
- $env{'form.'.$formname}=$file_content;
- $env{'form.'.$formname.'.filename'}=$new_fn;
- &Apache::lonnet::userfileupload('uploaddoc','',
- 'portfolio'.$env{'form.currentpath'});
- if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') {
- $r->print('<p><font color="red">'.
- &mt('Could not write metadata').', '.
- &mt('FAIL').'</font></p>');
- } else {
- $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
- ' '.&Apache::lonlocal::locallocaltime(time).
- '</font></p>');
- }
- } else {
- if (! ($mfh=Apache::File->new('>'.$fn))) {
- $r->print('<p><font color="red">'.
- &mt('Could not write metadata').', '.
- &mt('FAIL').'</font></p>');
- } else {
- print $mfh $file_content;
- $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
- ' '.&Apache::lonlocal::locallocaltime(time).
- '</font></p>');
- }
+ $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="'.
+
+ $r->print($output.'<br /><input type="submit" name="store" value="'.
&mt('Store Catalog Information').'">');
+
}
$r->print('</form>');
+
+ if ($env{'form.store'}) {
+ my $mfh;
+ my $formname='store';
+ my $file_content;
+ foreach my $meta_field (keys %env) {
+ 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) {
+ next if ($_ =~ /\./);
+ my $unikey=$_;
+ $unikey=~/^([A-Za-z]+)/;
+ my $tag=$1;
+ $tag=~tr/A-Z/a-z/;
+ $file_content.= "\n\<$tag";
+ foreach (split(/\,/,
+ $Apache::lonpublisher::metadatakeys{$unikey})
+ ) {
+ my $value=
+ $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
+ $value=~s/\"/\'\'/g;
+ $file_content.=' '.$_.'="'.$value.'"' ;
+ # print $mfh ' '.$_.'="'.$value.'"';
+ }
+ $file_content.= '>'.
+ &HTML::Entities::encode
+ ($Apache::lonpublisher::metadatafields{$unikey},
+ '<>&"').
+ '</'.$tag.'>';
+ }
+ if ($fn =~ /\/portfolio\//) {
+ $fn =~ /\/portfolio\/(.*)$/;
+ my $new_fn = '/'.$1;
+ $env{'form.'.$formname}=$file_content."\n";
+ $env{'form.'.$formname.'.filename'}=$new_fn;
+ &Apache::lonnet::userfileupload('uploaddoc','',
+ 'portfolio'.$env{'form.currentpath'});
+ if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') {
+ $r->print('<p><font color="red">'.
+ &mt('Could not write metadata').', '.
+ &mt('FAIL').'</font></p>');
+ } else {
+ $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
+ ' '.&Apache::lonlocal::locallocaltime(time).
+ '</font></p>');
+ }
+ } else {
+ if (! ($mfh=Apache::File->new('>'.$fn))) {
+ $r->print('<p><font color="red">'.
+ &mt('Could not write metadata').', '.
+ &mt('FAIL').'</font></p>');
+ } else {
+ print $mfh $file_content;
+ $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
+ ' '.&Apache::lonlocal::locallocaltime(time).
+ '</font></p>');
+ }
+ }
+ }
+
return;
}