--- loncom/interface/lonmeta.pm 2002/08/26 16:57:11 1.17 +++ loncom/interface/lonmeta.pm 2002/10/18 13:49:49 1.22 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.17 2002/08/26 16:57:11 www Exp $ +# $Id: lonmeta.pm,v 1.22 2002/10/18 13:49:49 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,7 +44,7 @@ sub dynamicmeta { my $url=&Apache::lonnet::declutter(shift); $url=~s/\.meta$//; my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//); - my $regexp=&Apache::lonnet::escape($url); + my $regexp=$url; $regexp=~s/(\W)/\\$1/g; $regexp='___'.$regexp.'___'; my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain, @@ -142,6 +142,21 @@ sub diffgraph { sub handler { my $r=shift; + + my $loaderror=&Apache::lonnet::overloaderror($r); + if ($loaderror) { return $loaderror; } + + + my $uri=$r->uri; + + my ($resdomain,$resuser)= + (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//); + + $loaderror= + &Apache::lonnet::overloaderror($r, + &Apache::lonnet::homeserver($resuser,$resdomain)); + if ($loaderror) { return $loaderror; } + my %content=(); # ----------------------------------------------------------- Set document type @@ -152,12 +167,9 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------------- Read file - - my $uri=$r->uri; foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) { $content{$_}=&Apache::lonnet::metadata($uri,$_); } - my ($resdomain)=(&Apache::lonnet::declutter($uri)=~/^(\w+)\//); # ------------------------------------------------------------------ Hide stuff unless ($ENV{'user.adv'}) { @@ -167,21 +179,31 @@ sub handler { } # --------------------------------------------------------------- Render Output - -my $creationdate=localtime($content{'creationdate'}); -my $lastrevisiondate=localtime($content{'lastrevisiondate'}); + my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta/); +my $creationdate=localtime( + &Apache::loncommon::unsqltime($content{'creationdate'})); +my $lastrevisiondate=localtime( + &Apache::loncommon::unsqltime($content{'lastrevisiondate'})); my $language=&Apache::loncommon::languagedescription($content{'language'}); my $mime=&Apache::loncommon::filedescription($content{'mime'}); my $disuri=&Apache::lonnet::declutter($uri); $disuri=~s/\.meta$//; +my $currentversion=&Apache::lonnet::getversion($disuri); +my $versiondisplay=''; +if ($thisversion) { + $versiondisplay='Version: '.$thisversion. + ' (most recent version: '.$currentversion.')'; +} else { + $versiondisplay='Version: '.$currentversion; +} my $bodytag=&Apache::loncommon::bodytag ('Catalog Information','','','',$resdomain); $r->print(<Catalog Information - $bodytag

$content{'title'}

$disuri

+$versiondisplay
Author(s) $content{'author'}