--- loncom/interface/lonmeta.pm 2005/02/01 17:37:23 1.90 +++ loncom/interface/lonmeta.pm 2005/03/18 16:47:31 1.95 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.90 2005/02/01 17:37:23 banghart Exp $ +# $Id: lonmeta.pm,v 1.95 2005/03/18 16:47:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -237,19 +237,8 @@ sub diffgraph { # The field names sub fieldnames { my $file_type=shift; - if ($file_type eq 'portfolio') { - return &Apache::lonlocal::texthash - ( - 'title' => 'Title', - 'author' =>'Author(s)', - 'authorspace' => 'Author Space', - 'modifyinguser' => 'Last Modifying User', - 'subject' => 'Subject', - 'keywords' => 'Keyword(s)'); - } else { - return &Apache::lonlocal::texthash - ( - 'title' => 'Title', + my %fields = + ('title' => 'Title', 'author' =>'Author(s)', 'authorspace' => 'Author Space', 'modifyinguser' => 'Last Modifying User', @@ -258,7 +247,11 @@ sub fieldnames { 'notes' => 'Notes', 'abstract' => 'Abstract', 'lowestgradelevel' => 'Lowest Grade Level', - 'highestgradelevel' => 'Highest Grade Level', + 'highestgradelevel' => 'Highest Grade Level'); + if (! defined($file_type) || $file_type ne 'portfolio') { + %fields = + (%fields, + 'domain' => 'Domain', 'standards' => 'Standards', 'mime' => 'MIME Type', 'language' => 'Language', @@ -291,7 +284,8 @@ sub fieldnames { 'disc' => 'Degree of discrimination', 'dependencies' => 'Resources used by this resource', ); - } + } + return &Apache::lonlocal::texthash(%fields); } # Pretty printing of metadata field @@ -542,7 +536,8 @@ sub handler { # my ($resdomain,$resuser)= (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//); - $r->print(''. + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'<head><title>'. 'Catalog Information'. ''); if ($uri=~m:/adm/bombs/(.*)$:) { @@ -924,7 +919,13 @@ ENDBOMBS } %Apache::lonpublisher::metadatafields=(); %Apache::lonpublisher::metadatakeys=(); - &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn)); + my $result=&Apache::lonnet::getfile($fn); + if ($result == -1){ + $r->print('Unable to get '.$fn); + return ; + } else { + &Apache::lonpublisher::metaeval($result); + } $r->print(<$displayfile
@@ -936,7 +937,8 @@ ENDEDIT my $output; my @fields; if ($file_type eq 'portfolio') { - @fields = ('author','title','subject','keywords'); + @fields = ('author','title','subject','keywords','abstract','notes','lowestgradelevel', + 'highestgradelevel'); } else { @fields = ('author','title','subject','keywords','abstract','notes', 'copyright','customdistributionfile','language', @@ -960,35 +962,58 @@ ENDEDIT } if ($ENV{'form.store'}) { my $mfh; - if (! ($mfh=Apache::File->new('>'.$fn))) { - $r->print('

'. - &mt('Could not write metadata').', '. - &mt('FAIL').'

'); + my $formname='store'; + my $file_content; + 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}, + '<>&"'). + ''; + } + 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'}); + 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').', '. + &mt('FAIL').'

'); + } else { + $r->print('

'.&mt('Wrote Metadata'). + ' '.&Apache::lonlocal::locallocaltime(time). + '

'); + } } else { - foreach (sort keys %Apache::lonpublisher::metadatafields) { - next if ($_ =~ /\./); - my $unikey=$_; - $unikey=~/^([A-Za-z]+)/; - my $tag=$1; - $tag=~tr/A-Z/a-z/; - print $mfh "\n\<$tag"; - foreach (split(/\,/, - $Apache::lonpublisher::metadatakeys{$unikey}) - ) { - my $value= - $Apache::lonpublisher::metadatafields{$unikey.'.'.$_}; - $value=~s/\"/\'\'/g; - print $mfh ' '.$_.'="'.$value.'"'; - } - print $mfh '>'. - &HTML::Entities::encode - ($Apache::lonpublisher::metadatafields{$unikey}, - '<>&"'). - ''; + if (! ($mfh=Apache::File->new('>'.$fn))) { + $r->print('

'. + &mt('Could not write metadata').', '. + &mt('FAIL').'

'); + } else { + print $mfh $file_content; + $r->print('

'.&mt('Wrote Metadata'). + ' '.&Apache::lonlocal::locallocaltime(time). + '

'); } - $r->print('

'.&mt('Wrote Metadata'). - ' '.&Apache::lonlocal::locallocaltime(time). - '

'); } } $r->print($output.'