--- loncom/interface/lonmeta.pm 2001/12/25 21:02:35 1.13
+++ 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.13 2001/12/25 21:02:35 www Exp $
+# $Id: lonmeta.pm,v 1.22 2002/10/18 13:49:49 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,11 +44,11 @@ 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
- ('resevaldata',$adomain,$aauthor,$regexp);
+ my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
+ $aauthor,$regexp);
my %sum;
my %cnt;
my %listitems=('count' => 'add',
@@ -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,34 +167,43 @@ sub handler {
return OK if $r->header_only;
# ------------------------------------------------------------------- Read file
-
- my $uri=$r->uri;
- map {
+ foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
$content{$_}=&Apache::lonnet::metadata($uri,$_);
- } split(/\,/,&Apache::lonnet::metadata($uri,'keys'));
-
+ }
# ------------------------------------------------------------------ Hide stuff
unless ($ENV{'user.adv'}) {
- map {
+ foreach ('keywords','notes','abstract','subject') {
$content{$_}='- not displayed -';
- } ('keywords','notes','abstract','subject');
+ }
}
# --------------------------------------------------------------- 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
-
-Catalog Information
+$bodytag
$content{'title'}
$disuri
+$versiondisplay
| Author(s) |
$content{'author'} |
@@ -219,7 +243,9 @@ ENDHEAD
delete($content{'copyright'});
if ($ENV{'user.adv'}) {
# ------------------------------------------------------------ Dynamic Metadata
- $r->print('Dynamic Metadata (updated periodically)
');
+ $r->print(
+ 'Dynamic Metadata (updated periodically)
Processing ...
');
+ $r->rflush();
my %items=(
'count' => 'Network-wide number of accesses (hits)',
'course' => 'Network-wide number of courses using resource',
@@ -278,12 +304,12 @@ $dynmeta{$_}." \n");
my $display=&Apache::lonnet::metadata($uri,$name.'.display');
unless ($display) { $display=$name; };
my $otherinfo='';
- map {
+ foreach ('name','part','type','default') {
if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) {
$otherinfo.=' '.$_.'='.
&Apache::lonnet::metadata($uri,$name.'.'.$_).'; ';
}
- } ('name','part','type','default');
+ }
$r->print(''.$display.': '.$content{$name});
if ($otherinfo) {
$r->print(' ('.$otherinfo.')');