Diff for /loncom/interface/lonmeta.pm between versions 1.46 and 1.47

version 1.46, 2003/12/29 17:11:53 version 1.47, 2003/12/29 19:01:27
Line 108  sub dynamicmeta { Line 108  sub dynamicmeta {
     #      #
     # Deal with 'count' separately      # Deal with 'count' separately
     $returnhash{'count'} = &access_count($url,$aauthor,$adomain);      $returnhash{'count'} = &access_count($url,$aauthor,$adomain);
       # since "usage" is reserved word in MySQL ...
       $returnhash{'sequsage'}=$returnhash{'usage'};
       $returnhash{'sequsage_list'}=$returnhash{'usage_list'};
   
     return %returnhash;      return %returnhash;
 }  }
Line 117  sub access_count { Line 120  sub access_count {
     my %countdata=&Apache::lonnet::dump('nohist_accesscount',$adomain,      my %countdata=&Apache::lonnet::dump('nohist_accesscount',$adomain,
                                         $author,$src);                                          $author,$src);
     if (! exists($countdata{$src})) {      if (! exists($countdata{$src})) {
         return 'Not Available';          return &mt('Not Available');
     } else {      } else {
         return $countdata{$src};          return $countdata{$src};
     }      }
Line 137  sub alttag { Line 140  sub alttag {
     $alttag=~s/\s+$//gs;      $alttag=~s/\s+$//gs;
     $alttag=~s/^\s+//gs;      $alttag=~s/^\s+//gs;
     if ($alttag) { return $alttag; } else       if ($alttag) { return $alttag; } else 
                  { return 'No information available'; }                   { return &mt('No information available'); }
 }  }
   
 # -------------------------------------------------------------- Author display  # -------------------------------------------------------------- Author display
Line 226  sub fieldnames { Line 229  sub fieldnames {
    'obsoletereplacement' => 'Suggested Replacement for Obsolete File',     'obsoletereplacement' => 'Suggested Replacement for Obsolete File',
    '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',     'course_list' => 'Network-wide courses using resource',
      'sequsage'      => 'Number of resources using or importing resource',
      'sequsage_list' => 'Resources using or importing resource',
    'goto'       => 'Number of resources that follow this resource in maps',     'goto'       => 'Number of resources that follow this resource in maps',
      'goto_list'  => 'Resources that follow this resource in maps',
    'comefrom'   => 'Number of resources that lead up to this resource in maps',     'comefrom'   => 'Number of resources that lead up to this resource in maps',
      'comefrom_list' => 'Resources that lead up to this resource in maps',
    'clear'      => 'Material presented in clear way',     'clear'      => 'Material presented in clear way',
    'depth'      => 'Material covered with sufficient depth',     'depth'      => 'Material covered with sufficient depth',
    'helpful'    => 'Material is helpful',     'helpful'    => 'Material is helpful',
Line 276  sub prettyprint { Line 283  sub prettyprint {
  $value=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;   $value=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;
  return $value;   return $value;
     }      }
   # Only for advance users below
       unless ($ENV{'user.adv'}) { return '<i>- '.&mt('not displayed').' -</i>' };
 # File  # File
     if (($type eq 'customdistributionfile') ||      if (($type eq 'customdistributionfile') ||
  ($type eq 'obsoletereplacement') ||   ($type eq 'obsoletereplacement') ||
Line 351  sub handler { Line 360  sub handler {
   foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {    foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
       $content{$_}=&Apache::lonnet::metadata($uri,$_);        $content{$_}=&Apache::lonnet::metadata($uri,$_);
   }    }
 # ------------------------------------------------------------------ Hide stuff  
   
   unless ($ENV{'user.adv'}) {  
       foreach ('keywords','notes','abstract','subject') {  
           $content{$_}='<i>- '.&mt('not displayed').' -</i>';  
       }  
   }  
   
 # --------------------------------------------------------------- Render Output  # --------------------------------------------------------------- Render Output
 # displayed url  # displayed url
     my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);      my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
Line 370  sub handler { Line 371  sub handler {
     my $versiondisplay='';      my $versiondisplay='';
     if ($thisversion) {      if ($thisversion) {
  $versiondisplay=&mt('Version').': '.$thisversion.   $versiondisplay=&mt('Version').': '.$thisversion.
     ' ('.&mt('most recent version').': '.$currentversion.')';      ' ('.&mt('most recent version').': '.
       ($currentversion>0?$currentversion:&mt('information not available')).')';
     } else {      } else {
  $versiondisplay='Version: '.$currentversion;   $versiondisplay='Version: '.$currentversion;
     }      }
Line 420  $table Line 422  $table
 ENDHEAD  ENDHEAD
   if ($ENV{'user.adv'}) {    if ($ENV{'user.adv'}) {
 # ------------------------------------------------------------ Dynamic Metadata  # ------------------------------------------------------------ Dynamic Metadata
    $r->print(  
    '<h3>'.&mt('Dynamic Metadata').' ('.  
      &mt('updated periodically').')</h3>'.&mt('Processing').  
      ' ...<br>');  
    $r->rflush();  
    my %items=&fieldnames();  
    my %dynmeta=&dynamicmeta($uri);  
    $r->print(  
 '</table><h4>'.&mt('Access and Usage Statistics').'</h4><table cellspacing=2 border=0>');  
    foreach ('count') {  
        $r->print(  
 '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.  
 $dynmeta{$_}."&nbsp;</td></tr>\n");  
    }  
    foreach my $cat ('usage','comefrom','goto') {  
        $r->print(  
 '<tr><td bgcolor="#AAAAAA">'.$items{$cat}.'</td><td bgcolor="#CCCCCC">'.  
 $dynmeta{$cat}.'<font size="-1"><ul>'.join("\n",  
       map { my $murl=$_;   
  '<li><a href="'.&Apache::lonnet::clutter($murl).'" target="preview">'.  
                         &Apache::lonnet::gettitle($murl).' [<tt>'.$murl  
                         .'</tt>]</a></li>' }  
       split(/\,/,$dynmeta{$cat.'_list'}))."</ul></font></td></tr>\n");  
    }  
    foreach my $cat ('course') {  
        $r->print(  
 '<tr><td bgcolor="#AAAAAA">'.$items{$cat}.'</td><td bgcolor="#CCCCCC">'.  
 $dynmeta{$cat}.'<font size="-1"><ul>'.join("\n",  
       map { my %courseinfo=&Apache::lonnet::coursedescription($_);    
  '<li><a href="/public/'.  
   $courseinfo{'domain'}.'/'.$courseinfo{'num'}.'/syllabus" target="preview">'.  
   $courseinfo{'description'}.'</a></li>' }  
       split(/\,/,$dynmeta{$cat.'_list'}))."</ul></font></td></tr>\n");  
    }  
        $r->print('</table>');  
    if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {  
       $r->print(        $r->print(
 '<h4>'.&mt('Assessment Statistical Data').'</h4><table cellspacing=2 border=0>');   '<h3>'.&mt('Dynamic Metadata').' ('.
       foreach ('stdno','avetries') {   &mt('updated periodically').')</h3>'.&mt('Processing').
           $r->print(   ' ...<br />');
 '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.        $r->rflush();
 $dynmeta{$_}."&nbsp;</td></tr>\n");        my %items=&fieldnames();
         my %dynmeta=&dynamicmeta($uri);
   # General Access and Usage Statistics
         $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4><table cellspacing=2 border=0>');
         foreach ('count',
          'sequsage','sequsage_list',
          'comefrom','comefrom_list',
          'goto','goto_list',
          'course','course_list') {
     $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td><td bgcolor="#CCCCCC">'.
       &prettyprint($dynmeta{$_})."</td></tr>\n");
       }        }
       foreach ('difficulty') {        $r->print('</table>');
          $r->print(        if ($uri=~/\.(problem|exam|quiz|assess|survey|form)\.meta$/) {
 '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.  # This is an assessment, print assessment data
 &diffgraph($dynmeta{$_})."</td></tr>\n");    $r->print(
       '<h4>'.&mt('Assessment Statistical Data').'</h4><table cellspacing=2 border=0>');
     foreach ('stdno','avetries','difficulty') {
         $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td><td bgcolor="#CCCCCC">'.
    &prettyprint($dynmeta{$_})."</td></tr>\n");
     }
     $r->print('</table>');    
         }
         $r->print('<h4>'.&mt('Evaluation Data').'</h4><table cellspacing=2 border=0>');
         foreach ('clear','depth','helpful','correct','technical') {
     $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td><td bgcolor="#CCCCCC">'.
       &prettyprint($dynmeta{$_})."</td></tr>\n");
        }    
         $r->print('</table>');
         $disuri=~/^(\w+)\/(\w+)\//;   
         if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
     || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
     $r->print(
       '<h4>'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')</h4>'.
       '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
     $r->print('<h4>'.&mt('Error Messages').' ('.
       &mt('visible to author and co-authors only').')</h4>');
     my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);
     foreach (keys %errormsgs) {
         if ($_=~/^\Q$disuri\E\_\d+$/) {
     my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_});
     $r->print('<b>'.$content{'time'}.'</b>: '.$content{'message'}.
       '<br />');
         }
     }      
       }        }
       $r->print('</table>');      
    }  
    $r->print('<h4>'.&mt('Evaluation Data').'</h4><table cellspacing=2 border=0>');  
    foreach ('clear','depth','helpful','correct','technical') {  
        $r->print(  
 '<tr><td bgcolor="#AAAAAA">'.$items{$_}.'</td><td bgcolor="#CCCCCC">'.  
 &evalgraph($dynmeta{$_})."</td></tr>\n");  
    }      
    $r->print('</table>');  
    $disuri=~/^(\w+)\/(\w+)\//;     
    if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))  
        || ($ENV{'user.role.ca./'.$1.'/'.$2})) {  
       $r->print(  
   '<h4>'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')</h4>'.  
       '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');  
       $r->print(  
    '<h4>'.&mt('Error Messages').' ('.  
           &mt('visible to author and co-authors only').')</h4>');  
       my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);  
       foreach (keys %errormsgs) {  
  if ($_=~/^\Q$disuri\E\_\d+$/) {  
           my %content=&Apache::lonmsg::unpackagemsg($errormsgs{$_});  
   $r->print('<b>'.$content{'time'}.'</b>: '.$content{'message'}.  
                     '<br />');  
         }  
       }        
    }  
 # ------------------------------------------------------------- All other stuff  # ------------------------------------------------------------- All other stuff
    $r->print(        $r->print(
  '<h3>'.&mt('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$/) {
   my $display=&Apache::lonnet::metadata($uri,$name.'.display');        my $display=&Apache::lonnet::metadata($uri,$name.'.display');
   unless ($display) { $display=$name; };        unless ($display) { $display=$name; };
   my $otherinfo='';        my $otherinfo='';
   foreach ('name','part','type','default') {        foreach ('name','part','type','default') {
       if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) {    if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) {
   $otherinfo.=' '.$_.'='.        $otherinfo.=' '.$_.'='.
       &Apache::lonnet::metadata($uri,$name.'.'.$_).'; ';    &Apache::lonnet::metadata($uri,$name.'.'.$_).'; ';
     }
       }        }
         $r->print('<b>'.$display.':</b> '.$content{$name});
         if ($otherinfo) {
     $r->print(' ('.$otherinfo.')');
         }
         $r->print("<br />\n");
   }    }
   $r->print('<b>'.$display.':</b> '.$content{$name});  
   if ($otherinfo) {  
       $r->print(' ('.$otherinfo.')');  
   }  
   $r->print("<br>\n");  
       }        }
    }  
   }    }
 # ===================================================== End Resource Space Call  # ===================================================== End Resource Space Call
  } else {   } else {

Removed from v.1.46  
changed lines
  Added in v.1.47


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