--- loncom/interface/lonmeta.pm	2000/10/23 13:21:12	1.2
+++ loncom/interface/lonmeta.pm	2001/12/22 21:59:07	1.9
@@ -1,47 +1,63 @@
 # The LearningOnline Network with CAPA
-#
 # Metadata display handler
 #
+# $Id: lonmeta.pm,v 1.9 2001/12/22 21:59:07 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (TeX Content Handler
 #
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)
 #
-# 10/19,10/21,10/23 Gerd Kortemeyer
+# 10/19,10/21,10/23,11/27,08/09/01,12/22 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
+# ----------------------------------------- Fetch and evaluate dynamic metadata
 
-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;
-       }
+sub dynamicmeta {
+    my $url=&Apache::lonnet::declutter(shift);
+    $url=~s/\.meta$//;
+    my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
+    my $regexp=&Apache::lonnet::escape($url);
+    $regexp=~s/(\W)/\\$1/g;
+    my %evaldata=&Apache::lonnet::dump
+                                     ('resevaldata',$adomain,$aauthor,$regexp);
+    my %returnhash=();
+    foreach (keys %evaldata) {
     }
-    return %content;
+    return %returnhash;
 }
 
 # ================================================================ Main Handler
 
 sub handler {
   my $r=shift;
-  my @metacontents;
-  my %content;
+  my %content=();
 
 # ----------------------------------------------------------- Set document type
 
@@ -52,12 +68,18 @@ 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{$_}='<i>- not displayed -</i>';
+      } ('keywords','notes','abstract','subject');
+  }
 
 # --------------------------------------------------------------- Render Output
 
@@ -96,11 +118,26 @@ ENDHEAD
   delete($content{'lastrevisiondate'});
   delete($content{'owner'});
   delete($content{'copyright'});
-  map {
-      my ($value,$name)=split(/\_\_dis\_\_/,$content{$_});
-      unless ($name) { $name=$_; }
-      $r->print('<b>'.$name.':</b> '.$value.'<br>');
-  } 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('<b>'.$display.':</b> '.$content{$name});
+      if ($otherinfo) {
+         $r->print(' ('.$otherinfo.')');
+      }
+      $r->print("<br>\n");
+   } sort keys %content;
+  }
+  &dynamicmeta($uri);
   $r->print('</body></html>');
   return OK;
 }