Diff for /loncom/interface/lonmeta.pm between versions 1.25 and 1.29

version 1.25, 2003/02/18 21:17:00 version 1.29, 2003/04/12 15:57:30
Line 55  sub dynamicmeta { Line 55  sub dynamicmeta {
     my %cnt;      my %cnt;
     my %listitems=('count'        => 'add',      my %listitems=('count'        => 'add',
                    'course'       => 'add',                     'course'       => 'add',
                      'goto'         => 'add',
                      'comefrom'     => 'add',
                    'avetries'     => 'avg',                     'avetries'     => 'avg',
                    'stdno'        => 'add',                     'stdno'        => 'add',
                    'difficulty'   => 'avg',                     'difficulty'   => 'avg',
Line 101  sub dynamicmeta { Line 103  sub dynamicmeta {
 # ------------------------------------- Try to make an alt tag if there is none  # ------------------------------------- Try to make an alt tag if there is none
   
 sub alttag {  sub alttag {
     my $src=shift;      my ($base,$src)=@_;
     return 'None';      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  # -------------------------------------------------------------- Pretty display
Line 200  my $mime=&Apache::loncommon::filedescrip Line 221  my $mime=&Apache::loncommon::filedescrip
 my $disuri=&Apache::lonnet::declutter($uri);  my $disuri=&Apache::lonnet::declutter($uri);
   $disuri=~s/\.meta$//;    $disuri=~s/\.meta$//;
 my $currentversion=&Apache::lonnet::getversion($disuri);  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='';  my $versiondisplay='';
 if ($thisversion) {  if ($thisversion) {
     $versiondisplay='Version: '.$thisversion.      $versiondisplay='Version: '.$thisversion.
Line 207  if ($thisversion) { Line 232  if ($thisversion) {
 } else {  } else {
     $versiondisplay='Version: '.$currentversion;      $versiondisplay='Version: '.$currentversion;
 }  }
   my $customdistributionfile='';
   if ($content{'customdistributionfile'}) {
      $customdistributionfile='<a href="'.$content{'customdistributionfile'}.
        '"><tt>'.$content{'customdistributionfile'}.'</tt></a>';
   }
 my $bodytag=&Apache::loncommon::bodytag  my $bodytag=&Apache::loncommon::bodytag
             ('Catalog Information','','','',$resdomain);              ('Catalog Information','','','',$resdomain);
   $r->print(<<ENDHEAD);    $r->print(<<ENDHEAD);
Line 217  $bodytag Line 247  $bodytag
 $versiondisplay<br />  $versiondisplay<br />
 <table cellspacing=2 border=0>  <table cellspacing=2 border=0>
 <tr><td bgcolor='#AAAAAA'>Author(s)</td>  <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>  <tr><td bgcolor='#AAAAAA'>Subject</td>
 <td bgcolor="#CCCCCC">$content{'subject'}&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$content{'subject'}&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Keyword(s)</td>  <tr><td bgcolor='#AAAAAA'>Keyword(s)</td>
Line 235  $versiondisplay<br /> Line 265  $versiondisplay<br />
 <tr><td bgcolor='#AAAAAA'>  <tr><td bgcolor='#AAAAAA'>
 Last Revision Date</td><td bgcolor="#CCCCCC">$lastrevisiondate&nbsp;</td></tr>  Last Revision Date</td><td bgcolor="#CCCCCC">$lastrevisiondate&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Publisher/Owner</td>  <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>  <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>  </table>
 ENDHEAD  ENDHEAD
   delete($content{'title'});    delete($content{'title'});
Line 310  $dynmeta{$_}."&nbsp;</td></tr>\n"); Line 342  $dynmeta{$_}."&nbsp;</td></tr>\n");
    '<h4>Error Messages (visible to author and co-authors only)</h4>');     '<h4>Error Messages (visible to author and co-authors only)</h4>');
       my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);        my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);
       foreach (keys %errormsgs) {        foreach (keys %errormsgs) {
  if ($_=~/^$disuri\_\d+$/) {   if ($_=~/^\Q$disuri\E\_\d+$/) {
           my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_});            my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_});
   $r->print('<b>'.$content{'time'}.'</b>: '.$content{'message'}.    $r->print('<b>'.$content{'time'}.'</b>: '.$content{'message'}.
                     '<br />');                      '<br />');
Line 370  $bodytag Line 402  $bodytag
 <form method="post">  <form method="post">
 ENDEDIT  ENDEDIT
    foreach ('author','title','subject','keywords','abstract','notes',     foreach ('author','title','subject','keywords','abstract','notes',
             'copyright','language') {              'copyright','customdistributionfile','language') {
        if ($ENV{'form.new_'.$_}) {         if ($ENV{'form.new_'.$_}) {
    $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};     $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
        }         }

Removed from v.1.25  
changed lines
  Added in v.1.29


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>