Diff for /loncom/interface/lontrackstudent.pm between versions 1.19 and 1.21

version 1.19, 2006/05/01 19:37:34 version 1.21, 2006/12/06 22:22:37
Line 48  use Apache::lonmysql; Line 48  use Apache::lonmysql;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Time::HiRes;  use Time::HiRes;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
   
 my $num_records=500;  my $num_records=500;
   
Line 183  sub get_max_time_in_db { Line 185  sub get_max_time_in_db {
     my $timestr = '';      my $timestr = '';
     while (my $line = <TIMEDATA>) {      while (my $line = <TIMEDATA>) {
         chomp($line);          chomp($line);
         $timestr = &Apache::lonnet::unescape($line);          $timestr = &unescape($line);
     }      }
     close(TIMEDATA);      close(TIMEDATA);
     return &Apache::lonmysql::unsqltime($timestr);      return &Apache::lonmysql::unsqltime($timestr);
Line 278  sub output_results { Line 280  sub output_results {
     while (my $line = <ACTIVITYDATA>) {      while (my $line = <ACTIVITYDATA>) {
         # FIXME: does not pass symbs along :(          # FIXME: does not pass symbs along :(
         chomp($line);          chomp($line);
         $line = &Apache::lonnet::unescape($line);          $line = &unescape($line);
         if (++$count % 50 == 0) {          if (++$count % 50 == 0) {
             if ($count != 0) {               if ($count != 0) { 
                 $r->print('</table>'.$/);                  $r->print('</table>'.$/);
Line 293  sub output_results { Line 295  sub output_results {
             ($symb,$timestamp,$action,$machine,$values) = split(',',$line,5);              ($symb,$timestamp,$action,$machine,$values) = split(',',$line,5);
         }          }
  foreach ($symb,$timestamp,$student,$action,$machine) {   foreach ($symb,$timestamp,$student,$action,$machine) {
     $_=&Apache::lonnet::unescape($_);      $_=&unescape($_);
  }   }
         my ($title,$src);          my ($title,$src);
         if ($symb =~ m:^/adm/:) {          if ($symb =~ m:^/adm/:) {
Line 380  sub display_values { Line 382  sub display_values {
  my %values=map {split('=',$_,-1)} split(/\&/,$values);   my %values=map {split('=',$_,-1)} split(/\&/,$values);
  foreach my $key (sort(keys(%values))) {   foreach my $key (sort(keys(%values))) {
     $result.='<tr><td align="right">'.      $result.='<tr><td align="right">'.
  &Apache::lonnet::unescape($key).   &unescape($key).
  '</td><td>=</td><td align="left">'.   '</td><td>=</td><td align="left">'.
  &Apache::lonnet::unescape($values{$key}).'</td></tr>';   &unescape($values{$key}).'</td></tr>';
  }   }
  $result.='</table>';   $result.='</table>';
     } elsif ($action eq 'POST') {      } elsif ($action eq 'POST') {
  my %values=   my %values=
     map {split('=',&Apache::lonnet::unescape($_),-1)} split(/\&/,$values);      map {split('=',&unescape($_),-1)} split(/\&/,$values);
  foreach my $key (sort(keys(%values))) {   foreach my $key (sort(keys(%values))) {
     if ($key eq 'counter') { next; }      if ($key eq 'counter') { next; }
     $result.='<tr><td align="right">'.$key.'</td>'.      $result.='<tr><td align="right">'.$key.'</td>'.
Line 395  sub display_values { Line 397  sub display_values {
  }   }
  $result.='</table>';   $result.='</table>';
     } else {      } else {
  $result=&Apache::lonnet::unescape($values)   $result=&unescape($values)
     }      }
     return $result;      return $result;
 }  }
Line 535  sub handler { Line 537  sub handler {
         # For now, just show all the data, in the future allow selection of          # For now, just show all the data, in the future allow selection of
         # a student          # a student
         my ($sname,$sdom) = split(':',$env{'form.selected_student'});          my ($sname,$sdom) = split(':',$env{'form.selected_student'});
         if ($sname =~ /^\w*$/ && $sdom =~ /^\w*$/) {          if ($sname =~ /^$LONCAPA::username_re$/ 
       && $sdom =~ /^$LONCAPA::domain_re$/) {
             $r->print('<h2>'.              $r->print('<h2>'.
                       &mt('Recent activity of [_1]@[_2]',$sname,$sdom).                        &mt('Recent activity of [_1]:[_2]',$sname,$sdom).
                       '</h2>');                        '</h2>');
             $r->print('<p>'.&mt(<<END).'</p>');              $r->print('<p>'.&mt(<<END).'</p>');
 Compiling student activity data can take a long time.  Compiling student activity data can take a long time.
Line 546  END Line 549  END
             &get_data($r,\%prog_state,$navmap,              &get_data($r,\%prog_state,$navmap,
                       'student:'.$env{'form.selected_student'});                        'student:'.$env{'form.selected_student'});
         } else {          } else {
             $r->print('<h2>'.&mt('Unable to process for [_1]@[_2]',              $r->print('<h2>'.&mt('Unable to process for [_1]:[_2]',
                                  $sname,$sdom).'</h2>');                                   $sname,$sdom).'</h2>');
         }          }
     } else {      } else {

Removed from v.1.19  
changed lines
  Added in v.1.21


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