Diff for /loncom/interface/lonmeta.pm between versions 1.33 and 1.37

version 1.33, 2003/07/15 19:04:31 version 1.37, 2003/09/27 13:20:46
Line 39  use Apache::lonnet(); Line 39  use Apache::lonnet();
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonmsg;  use Apache::lonmsg;
 use Apache::lonpublisher;  use Apache::lonpublisher;
   use Apache::lonlocal;
   
 # ----------------------------------------- Fetch and evaluate dynamic metadata  # ----------------------------------------- Fetch and evaluate dynamic metadata
   
Line 70  sub dynamicmeta { Line 71  sub dynamicmeta {
                    'usage'        => 'cnt'                     'usage'        => 'cnt'
                    );                     );
     foreach (keys %evaldata) {      foreach (keys %evaldata) {
  my ($item,$purl,$cat)=split(/\_\_\_/,$_);   my ($item,$purl,$cat)=&Apache::lonnet::decode_symb($_);
 ### print "\n".$_.' - '.$item.'<br />';  ### print "\n".$_.' - '.$item.'<br />';
         if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }          if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
         unless ($listitems{$cat} eq 'app') {          unless ($listitems{$cat} eq 'app') {
Line 199  sub handler { Line 200  sub handler {
   
 # ----------------------------------------------------------- Set document type  # ----------------------------------------------------------- Set document type
   
   $r->content_type('text/html');    &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;    $r->send_http_header;
   
   return OK if $r->header_only;    return OK if $r->header_only;
Line 212  sub handler { Line 213  sub handler {
   
   unless ($ENV{'user.adv'}) {    unless ($ENV{'user.adv'}) {
       foreach ('keywords','notes','abstract','subject') {        foreach ('keywords','notes','abstract','subject') {
           $content{$_}='<i>- not displayed -</i>';            $content{$_}='<i>- '.&mt('not displayed').' -</i>';
       }        }
   }    }
   
Line 243  if ($content{'customdistributionfile'}) Line 244  if ($content{'customdistributionfile'})
    $customdistributionfile='<a href="'.$content{'customdistributionfile'}.     $customdistributionfile='<a href="'.$content{'customdistributionfile'}.
      '"><tt>'.$content{'customdistributionfile'}.'</tt></a>';       '"><tt>'.$content{'customdistributionfile'}.'</tt></a>';
 }  }
   
   my $obsolete=$content{'obsolete'};
   my $obsoletereplace=$content{'obsoletereplacement'};
   my $obsoletewarning='';
   if (($obsolete) && ($ENV{'user.adv'})) {
       $obsoletewarning='<p><font color="red">'.&mt('This resource has been marked obsolete by the author(s)').'</font></p>';
   }
   
   my %lt=&Apache::lonlocal::texthash(
      'au' =>'Author(s)',
      'sb' => 'Subject',
      'kw' => 'Keyword(s)',
      'no' => 'Notes',
      'ab' => 'Abstract',
      'mi' => 'MIME Type',
      'la' => 'Language',
      'cd' => 'Creation Date',
      'pu' => 'Publisher/Owner',
                                      'co' => 'Copyright/Distribution',
      'cf' => 'Custom Distribution File',
                                      'ob' => 'Obsolete',
                                      'or' => 
                                       'Suggested Replacement for Obsolete File');
 my $bodytag=&Apache::loncommon::bodytag  my $bodytag=&Apache::loncommon::bodytag
             ('Catalog Information','','','',$resdomain);              ('Catalog Information','','','',$resdomain);
   $r->print(<<ENDHEAD);    $r->print(<<ENDHEAD);
Line 250  my $bodytag=&Apache::loncommon::bodytag Line 274  my $bodytag=&Apache::loncommon::bodytag
 $bodytag  $bodytag
 <h2>$content{'title'}</h2>  <h2>$content{'title'}</h2>
 <h3><tt>$disuri</tt></h3>  <h3><tt>$disuri</tt></h3>
   $obsoletewarning
 $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'>$lt{'au'}</td>
 <td bgcolor="#CCCCCC">$author&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$author&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Subject</td>  <tr><td bgcolor='#AAAAAA'>$lt{'sb'}</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'>$lt{'kw'}</td>
 <td bgcolor="#CCCCCC">$content{'keywords'}&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$content{'keywords'}&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Notes</td>  <tr><td bgcolor='#AAAAAA'>$lt{'no'}</td>
 <td bgcolor="#CCCCCC">$content{'notes'}&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$content{'notes'}&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Abstract</td>  <tr><td bgcolor='#AAAAAA'>$lt{'ab'}</td>
 <td bgcolor="#CCCCCC">$content{'abstract'}&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$content{'abstract'}&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>MIME Type</td>  <tr><td bgcolor='#AAAAAA'>$lt{'mi'}</td>
 <td bgcolor="#CCCCCC">$mime ($content{'mime'})&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$mime ($content{'mime'})&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Language</td>  <tr><td bgcolor='#AAAAAA'>$lt{'la'}</td>
 <td bgcolor="#CCCCCC">$language&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$language&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Creation Date</td>  <tr><td bgcolor='#AAAAAA'>$lt{'cd'}</td>
 <td bgcolor="#CCCCCC">$creationdate&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$creationdate&nbsp;</td></tr>
 <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'>$lt{'pu'}</td>
 <td bgcolor="#CCCCCC">$owner&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$owner&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Copyright/Distribution</td>  <tr><td bgcolor='#AAAAAA'>$lt{'co'}</td>
 <td bgcolor="#CCCCCC">$content{'copyright'}&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$content{'copyright'}&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>Custom Distribution File</td>  <tr><td bgcolor='#AAAAAA'>$lt{'cf'}</td>
 <td bgcolor="#CCCCCC">$customdistributionfile&nbsp;</td></tr>  <td bgcolor="#CCCCCC">$customdistributionfile&nbsp;</td></tr>
   <tr><td bgcolor='#AAAAAA'>$lt{'ob'}</td>
   <td bgcolor="#CCCCCC">$obsolete&nbsp;</td></tr>
   <tr><td bgcolor='#AAAAAA'>$lt{'or'}</td>
   <td bgcolor="#CCCCCC">$obsoletereplace&nbsp;</td></tr>
 </table>  </table>
 ENDHEAD  ENDHEAD
   delete($content{'title'});    delete($content{'title'});
Line 291  ENDHEAD Line 320  ENDHEAD
   delete($content{'owner'});    delete($content{'owner'});
   delete($content{'copyright'});    delete($content{'copyright'});
   delete($content{'customdistributionfile'});    delete($content{'customdistributionfile'});
     delete($content{'obsolete'});
     delete($content{'obsoletereplacement'});
   if ($ENV{'user.adv'}) {    if ($ENV{'user.adv'}) {
 # ------------------------------------------------------------ Dynamic Metadata  # ------------------------------------------------------------ Dynamic Metadata
    $r->print(     $r->print(
    '<h3>Dynamic Metadata (updated periodically)</h3>Processing ...<br>');     '<h3>'.&mt('Dynamic Metadata').' ('.
        &mt('updated periodically').')</h3>'.&mt('Processing').
        ' ...<br>');
    $r->rflush();     $r->rflush();
     my %items=(      my %items=&Apache::lonlocal::texthash(
  'count'      => 'Network-wide number of accesses (hits)',   'count'      => 'Network-wide number of accesses (hits)',
  'course'     => 'Network-wide number of courses using resource',   'course'     => 'Network-wide number of courses using resource',
  'usage'      => 'Number of resources using or importing resource',   'usage'      => 'Number of resources using or importing resource',
Line 312  ENDHEAD Line 345  ENDHEAD
  'difficulty' => 'Degree of difficulty');   'difficulty' => 'Degree of difficulty');
    my %dynmeta=&dynamicmeta($uri);     my %dynmeta=&dynamicmeta($uri);
    $r->print(     $r->print(
 '</table><h4>Access and Usage Statistics</h4><table cellspacing=2 border=0>');  '</table><h4>'.&mt('Access and Usage Statistics').'</h4><table cellspacing=2 border=0>');
    foreach ('count') {     foreach ('count') {
        $r->print(         $r->print(
 '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.  '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
Line 341  $dynmeta{$cat}.'<font size="-1"><ul>'.jo Line 374  $dynmeta{$cat}.'<font size="-1"><ul>'.jo
        $r->print('</table>');         $r->print('</table>');
    if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {     if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
       $r->print(        $r->print(
 '<h4>Assessment Statistical Data</h4><table cellspacing=2 border=0>');  '<h4>'.&mt('Assessment Statistical Data').'</h4><table cellspacing=2 border=0>');
       foreach ('stdno','avetries') {        foreach ('stdno','avetries') {
           $r->print(            $r->print(
 '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.  '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
Line 354  $dynmeta{$_}."&nbsp;</td></tr>\n"); Line 387  $dynmeta{$_}."&nbsp;</td></tr>\n");
       }        }
       $r->print('</table>');            $r->print('</table>');    
    }     }
    $r->print('<h4>Evaluation Data</h4><table cellspacing=2 border=0>');     $r->print('<h4>'.&mt('Evaluation Data').'</h4><table cellspacing=2 border=0>');
    foreach ('clear','depth','helpful','correct','technical') {     foreach ('clear','depth','helpful','correct','technical') {
        $r->print(         $r->print(
 '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.  '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.
Line 365  $dynmeta{$_}."&nbsp;</td></tr>\n"); Line 398  $dynmeta{$_}."&nbsp;</td></tr>\n");
    if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))     if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
        || ($ENV{'user.role.ca./'.$1.'/'.$2})) {         || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
       $r->print(        $r->print(
   '<h4>Evaluation Comments (visible to author and co-authors only)</h4>'.    '<h4>'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')</h4>'.
       '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');        '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
       $r->print(        $r->print(
    '<h4>Error Messages (visible to author and co-authors only)</h4>');     '<h4>'.&mt('Error Messages').' ('.
             &mt('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 ($_=~/^\Q$disuri\E\_\d+$/) {   if ($_=~/^\Q$disuri\E\_\d+$/) {
Line 380  $dynmeta{$_}."&nbsp;</td></tr>\n"); Line 414  $dynmeta{$_}."&nbsp;</td></tr>\n");
    }     }
 # ------------------------------------------------------------- All other stuff  # ------------------------------------------------------------- All other stuff
    $r->print(     $r->print(
  '<h3>Additional Metadata (non-standard, parameters, exports)</h3>');   '<h3>'.&mt('Additional Metadata (non-standard, parameters, exports)').'</h3>');
    foreach (sort keys %content) {     foreach (sort keys %content) {
       my $name=$_;        my $name=$_;
       unless ($name=~/\.display$/) {        unless ($name=~/\.display$/) {
Line 421  $dynmeta{$_}."&nbsp;</td></tr>\n"); Line 455  $dynmeta{$_}."&nbsp;</td></tr>\n");
   if ($disuri=~/\/default$/) {    if ($disuri=~/\/default$/) {
       my $dir=$disuri;        my $dir=$disuri;
       $dir=~s/default$//;        $dir=~s/default$//;
       $displayfile='Default Cataloging Information for Directory '.$dir;        $displayfile=&mt('Default Cataloging Information for Directory').' '.
     $dir;
   }    }
   %Apache::lonpublisher::metadatafields=();    %Apache::lonpublisher::metadatafields=();
   %Apache::lonpublisher::metadatakeys=();    %Apache::lonpublisher::metadatakeys=();
Line 433  $bodytag Line 468  $bodytag
 <form method="post">  <form method="post">
 ENDEDIT  ENDEDIT
    foreach ('author','title','subject','keywords','abstract','notes',     foreach ('author','title','subject','keywords','abstract','notes',
             'copyright','customdistributionfile','language') {              'copyright','customdistributionfile','language',
               'obsolete','obsoletereplacement') {
        if ($ENV{'form.new_'.$_}) {         if ($ENV{'form.new_'.$_}) {
    $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};     $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
        }         }
Line 456  ENDEDIT Line 492  ENDEDIT
       my $mfh;        my $mfh;
       unless ($mfh=Apache::File->new('>'.$fn)) {        unless ($mfh=Apache::File->new('>'.$fn)) {
             $r->print(              $r->print(
             '<p><font color=red>Could not write metadata, FAIL</font>');              '<p><font color=red>'.&mt('Could not write metadata').', '.
         &mt('FAIL').'</font>');
       } else {        } else {
           foreach (sort keys %Apache::lonpublisher::metadatafields) {            foreach (sort keys %Apache::lonpublisher::metadatafields) {
             unless ($_=~/\./) {              unless ($_=~/\./) {
Line 477  ENDEDIT Line 514  ENDEDIT
                         .'</'.$tag.'>';                          .'</'.$tag.'>';
             }              }
   }    }
           $r->print('<p>Wrote Metadata');            $r->print('<p>'.&mt('Wrote Metadata'));
       }        }
     }      }
     $r->print(      $r->print(
  '<br /><input type="submit" name="store" value="Store Catalog Information"></form></body></html>');   '<br /><input type="submit" name="store" value="'.
   &mt('Store Catalog Information').'"></form></body></html>');
     return OK;      return OK;
   }    }
 }  }

Removed from v.1.33  
changed lines
  Added in v.1.37


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