--- loncom/interface/lonmeta.pm	2002/10/25 13:50:48	1.24
+++ loncom/interface/lonmeta.pm	2003/04/12 15:57:30	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.24 2002/10/25 13:50:48 www Exp $
+# $Id: lonmeta.pm,v 1.29 2003/04/12 15:57:30 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,6 +55,8 @@ sub dynamicmeta {
     my %cnt;
     my %listitems=('count'        => 'add',
                    'course'       => 'add',
+                   'goto'         => 'add',
+                   'comefrom'     => 'add',
                    'avetries'     => 'avg',
                    'stdno'        => 'add',
                    'difficulty'   => 'avg',
@@ -98,6 +100,32 @@ sub dynamicmeta {
     return %returnhash;
 }
 
+# ------------------------------------- Try to make an alt tag if there is none
+
+sub alttag {
+    my ($base,$src)=@_;
+    my $fullpath=&Apache::lonnet::hreflocation($base,$src);
+    my $alttag=&Apache::lonnet::metadata($fullpath,'title').' '.
+               &Apache::lonnet::metadata($fullpath,'subject').' '.
+               &Apache::lonnet::metadata($fullpath,'abstract');
+    $alttag=~s/\s+/ /gs;
+    $alttag=~s/\"//gs;
+    $alttag=~s/\'//gs;
+    $alttag=~s/\s+$//gs;
+    $alttag=~s/^\s+//gs;
+    if ($alttag) { return $alttag; } else 
+                 { return 'No information available'; }
+}
+
+# -------------------------------------------------------------- Author display
+
+sub authordisplay {
+    my ($aname,$adom)=@_;
+    return &Apache::loncommon::aboutmewrapper(
+                &Apache::loncommon::plainname($aname,$adom),
+                    $aname,$adom).' <tt>['.$aname.'@'.$adom.']</tt>';
+}
+
 # -------------------------------------------------------------- Pretty display
 
 sub evalgraph {
@@ -193,6 +221,10 @@ my $mime=&Apache::loncommon::filedescrip
 my $disuri=&Apache::lonnet::declutter($uri);
   $disuri=~s/\.meta$//;
 my $currentversion=&Apache::lonnet::getversion($disuri);
+my $author=$content{'author'};
+$author=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;
+my $owner=$content{'owner'};
+$owner=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;
 my $versiondisplay='';
 if ($thisversion) {
     $versiondisplay='Version: '.$thisversion.
@@ -200,6 +232,11 @@ if ($thisversion) {
 } else {
     $versiondisplay='Version: '.$currentversion;
 }
+my $customdistributionfile='';
+if ($content{'customdistributionfile'}) {
+   $customdistributionfile='<a href="'.$content{'customdistributionfile'}.
+     '"><tt>'.$content{'customdistributionfile'}.'</tt></a>';
+}
 my $bodytag=&Apache::loncommon::bodytag
             ('Catalog Information','','','',$resdomain);
   $r->print(<<ENDHEAD);
@@ -210,7 +247,7 @@ $bodytag
 $versiondisplay<br />
 <table cellspacing=2 border=0>
 <tr><td bgcolor='#AAAAAA'>Author(s)</td>
-<td bgcolor="#CCCCCC">$content{'author'}&nbsp;</td></tr>
+<td bgcolor="#CCCCCC">$author&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Subject</td>
 <td bgcolor="#CCCCCC">$content{'subject'}&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Keyword(s)</td>
@@ -228,9 +265,11 @@ $versiondisplay<br />
 <tr><td bgcolor='#AAAAAA'>
 Last Revision Date</td><td bgcolor="#CCCCCC">$lastrevisiondate&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Publisher/Owner</td>
-<td bgcolor="#CCCCCC">$content{'owner'}&nbsp;</td></tr>
+<td bgcolor="#CCCCCC">$owner&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Copyright/Distribution</td>
-<td bgcolor="#CCCCCC">$content{'copyright'}
+<td bgcolor="#CCCCCC">$content{'copyright'}&nbsp;</td></tr>
+<tr><td bgcolor='#AAAAAA'>Custom Distribution File</td>
+<td bgcolor="#CCCCCC">$customdistributionfile&nbsp;</td></tr>
 </table>
 ENDHEAD
   delete($content{'title'});
@@ -303,7 +342,7 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
    '<h4>Error Messages (visible to author and co-authors only)</h4>');
       my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);
       foreach (keys %errormsgs) {
-	if ($_=~/^$disuri\_\d+$/) {
+	if ($_=~/^\Q$disuri\E\_\d+$/) {
           my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_});
 	  $r->print('<b>'.$content{'time'}.'</b>: '.$content{'message'}.
                     '<br />');
@@ -363,7 +402,7 @@ $bodytag
 <form method="post">
 ENDEDIT
    foreach ('author','title','subject','keywords','abstract','notes',
-            'copyright','language') {
+            'copyright','customdistributionfile','language') {
        if ($ENV{'form.new_'.$_}) {
 	   $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
        }