--- loncom/interface/lonmeta.pm 2000/10/21 10:46:35 1.1
+++ loncom/interface/lonmeta.pm 2001/08/10 17:20:19 1.7
@@ -6,42 +6,20 @@
#
# 05/29/00,05/30,10/11 Gerd Kortemeyer)
#
-# 10/19,10/21 Gerd Kortemeyer
+# 10/19,10/21,10/23,11/27,08/09/01 Gerd Kortemeyer
package Apache::lonmeta;
use strict;
-use Apache::File;
use Apache::Constants qw(:common);
-use HTML::TokeParser;
+use Apache::lonnet();
-# ================================================= Unpack metadata into a hash
-
-sub unpackagemeta {
- my ($datastring,$fordisplay)=@_;
- my %content=();
- my $parser=HTML::TokeParser->new(\$datastring);
- my $token;
- while ($token=$parser->get_token) {
- if ($token->[0] eq 'S') {
- my $entry=$token->[1];
- my $value=$parser->get_text('/'.$entry);
- if (($token->[2]->{'display'}) && ($fordisplay)) {
- $value.='__dis__'.$token->[2]->{'display'};
- }
- $content{$entry}=$value;
- }
- }
- return %content;
-}
-
# ================================================================ Main Handler
sub handler {
my $r=shift;
- my @metacontents;
- my %content;
+ my %content=();
# ----------------------------------------------------------- Set document type
@@ -52,14 +30,23 @@ sub handler {
# ------------------------------------------------------------------- Read file
- {
- my $fh=Apache::File->new($r->filename);
- @metacontents=<$fh>;
- }
+ my $uri=$r->uri;
+ map {
+ $content{$_}=&Apache::lonnet::metadata($uri,$_);
+ } split(/\,/,&Apache::lonnet::metadata($uri,'keys'));
- %content=&unpackagemeta(join("\n",@metacontents),1);
+# ------------------------------------------------------------------ Hide stuff
+
+ unless ($ENV{'user.adv'}) {
+ map {
+ $content{$_}='- not displayed -';
+ } ('keywords','notes','abstract','subject');
+ }
# --------------------------------------------------------------- Render Output
+
+my $creationdate=localtime($content{'creationdate'});
+my $lastrevisiondate=localtime($content{'lastrevisiondate'});
$r->print(<Catalog Information
@@ -75,8 +62,8 @@ sub handler {
MIME Type: $content{'mime'}
Language: $content{'language'}
-Creation Date: $content{'creationdate'}
-Last Revision Date: $content{'lastrevisiondate'}
+Creation Date: $creationdate
+Last Revision Date: $lastrevisiondate
Publisher/Owner: $content{'owner'}
Copyright/Distribution: $content{'copyright'}
@@ -93,11 +80,25 @@ ENDHEAD
delete($content{'lastrevisiondate'});
delete($content{'owner'});
delete($content{'copyright'});
- map {
- my ($value,$name)=split(/\_\_dis\_\_/,$content{$_});
- unless ($name) { $name=$_; }
- $r->print(''.$name.': '.$value.'
');
- } sort keys %content;
+ if ($ENV{'user.adv'}) {
+ map {
+ my $name=$_;
+ my $display=&Apache::lonnet::metadata($uri,$name.'.display');
+ unless ($display) { $display=$name; };
+ my $otherinfo='';
+ map {
+ 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.')');
+ }
+ $r->print("
\n");
+ } sort keys %content;
+ }
$r->print('