--- loncom/interface/lonmeta.pm 2003/12/30 22:19:18 1.51 +++ loncom/interface/lonmeta.pm 2003/12/31 15:34:32 1.53 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.51 2003/12/30 22:19:18 www Exp $ +# $Id: lonmeta.pm,v 1.53 2003/12/31 15:34:32 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -298,8 +298,9 @@ sub prettyprint { ($type eq 'comefrom_list') || ($type eq 'sequsage_list')) { return join('
',map { - &Apache::lonnet::gettitle($_).' ['. - &Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($_),'preview').']'; + my $url=&Apache::lonnet::clutter($_); + '
'.&Apache::lonnet::gettitle($url).''. + &Apache::lonhtmlcommon::crumbs($url,'preview',''); } split(/\s*\,\s*/,$value)); } # Evaluations @@ -435,7 +436,6 @@ sub handler { my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/); $uri=~s/\.meta$//; my $disuri=&Apache::lonnet::clutter($uri); - $disuri=&Apache::lonhtmlcommon::crumbs($disuri); # version my $currentversion=&Apache::lonnet::getversion($disuri); my $versiondisplay=''; @@ -446,6 +446,8 @@ sub handler { } else { $versiondisplay='Version: '.$currentversion; } +# crumbify displayed URL + $disuri=&Apache::lonhtmlcommon::crumbs($disuri); # obsolete my $obsolete=$content{'obsolete'}; my $obsoletewarning=''; @@ -463,7 +465,10 @@ sub handler { 'subject', 'keywords', 'notes', - 'abstract', + 'abstract', + 'lowestgradelevel', + 'highestgradelevel', + 'standards', 'mime', 'language', 'creationdate', @@ -570,77 +575,104 @@ ENDHEAD return OK if $r->header_only; # ---------------------------------------------------------------------- Header - my $bodytag=&Apache::loncommon::bodytag('Edit Catalog Information'); my $disuri=$uri; my $fn=&Apache::lonnet::filelocation('',$uri); - $disuri=~s/^\/\~\w+//; + $disuri=~s/^\/\~/\/priv\//; $disuri=~s/\.meta$//; - 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=(); - &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn)); - $r->print(<print(<Edit Catalog Information +$bodytag +

$disuri

+
+ +
$bombs +
+ + +ENDBOMBS + } else { + my $displayfile='Catalog Information for '.$disuri; + if ($disuri=~/\/default$/) { + my $dir=$disuri; + $dir=~s/default$//; + $displayfile=&mt('Default Cataloging Information for Directory').' '. + $dir; + } + my $bodytag=&Apache::loncommon::bodytag('Edit Catalog Information'); + %Apache::lonpublisher::metadatafields=(); + %Apache::lonpublisher::metadatakeys=(); + &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn)); + $r->print(<Edit Catalog Information $bodytag

$displayfile

ENDEDIT - $r->print(''); - my %lt=&fieldnames(); - foreach ('author','title','subject','keywords','abstract','notes', - 'copyright','customdistributionfile','language','standards', - 'lowestgradelevel','highestgradelevel', - 'obsolete','obsoletereplacement') { - $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_}; - unless ($Apache::lonpublisher::metadatafields{'copyright'}) { - $Apache::lonpublisher::metadatafields{'copyright'}='default'; - } - $r->print('

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

'); - } - if ($ENV{'form.store'}) { - my $mfh; - unless ($mfh=Apache::File->new('>'.$fn)) { - $r->print( - '

'.&mt('Could not write metadata').', '. - &mt('FAIL').''); - } else { - foreach (sort keys %Apache::lonpublisher::metadatafields) { - unless ($_=~/\./) { - 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}) - .''; - } + $r->print(''); + my %lt=&fieldnames(); + foreach ('author','title','subject','keywords','abstract','notes', + 'copyright','customdistributionfile','language','standards', + 'lowestgradelevel','highestgradelevel', + 'obsolete','obsoletereplacement') { + $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_}; + unless ($Apache::lonpublisher::metadatafields{'copyright'}) { + $Apache::lonpublisher::metadatafields{'copyright'}='default'; } - $r->print('

'.&mt('Wrote Metadata')); + $r->print('

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

'); } - } - $r->print( - '
'); - return OK; + if ($ENV{'form.store'}) { + my $mfh; + unless ($mfh=Apache::File->new('>'.$fn)) { + $r->print( + '

'.&mt('Could not write metadata').', '. + &mt('FAIL').''); + } else { + foreach (sort keys %Apache::lonpublisher::metadatafields) { + unless ($_=~/\./) { + 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}) + .''; + } + } + $r->print('

'.&mt('Wrote Metadata')); + } + } + $r->print( + '
'); } + return OK; + } } # ================================================================= BEGIN Block