--- loncom/interface/lontrackstudent.pm	2005/02/17 08:29:43	1.14
+++ loncom/interface/lontrackstudent.pm	2007/02/13 01:44:02	1.23
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lontrackstudent.pm,v 1.14 2005/02/17 08:29:43 albertel Exp $
+# $Id: lontrackstudent.pm,v 1.23 2007/02/13 01:44:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,9 +45,13 @@ package Apache::lontrackstudent;
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonmysql;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::lonlocal;
 use Time::HiRes;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
+my $num_records=500;
 
 sub get_data {
     my ($r,$prog_state,$navmap,$mode) = @_;
@@ -61,9 +65,9 @@ sub get_data {
     #
     my $max_time = &get_max_time_in_db($r,$prog_state);
     if (defined($max_time)) {
-        $r->print('<h3>'.&mt('Activity data goes to [_1]',
+        $r->print('<h3>'.&mt('Activity data compiled up to [_1]',
                              &Apache::lonlocal::locallocaltime($max_time)).
-                  '</h3>');
+                  '</h3>'.&mt('While data is processed, periodically reload this page for more recent activity').'<br />');
         $r->rflush();
     } else {
         $r->print('<h3>'.&mt('Unable to retrieve any data.  Please reload this page and try again.').'</h3>');
@@ -72,7 +76,7 @@ sub get_data {
     my $query = &build_query($mode);
     ##
     ## Send it along
-    my $home = $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+    my $home = $env{'course.'.$env{'request.course.id'}.'.home'};
     my $reply=&Apache::lonnet::metadata_query($query,undef,undef,[$home]);
     if (ref($reply) ne 'HASH') {
         $r->print('<h2>'.
@@ -106,16 +110,31 @@ sub get_data {
     &Apache::lonhtmlcommon::Update_PrgWin
         ($r,$prog_state,&mt('Parsing results'));
     #
-    &output_results($r,$results_file,$navmap,$mode);
+    my $last = &output_results($r,$results_file,$navmap,$mode);
+    my ($sname,$sdom) = ($mode=~/^student:(.*):(.*)$/);
+    
+    my ($text,$inc);
+    if ( $last > 0 && (($last+1) >= $env{'form.start'}+$num_records) ) {
+	$text = 'View more activity by this student';
+	$inc  = $num_records;
+	$r->print(&Apache::loncommon::track_student_link($text,$sname,$sdom,undef,
+							 ($env{'form.start'}+$inc)
+							 ));
+	$r->print('<br />');
+    }
+    $text = 'Resubmit last request to check for newer data';
+    $r->print(&Apache::loncommon::track_student_link($text,$sname,$sdom,undef,
+						     $env{'form.start'}));
+
     &Apache::lonhtmlcommon::Update_PrgWin($r,$prog_state,&mt('Finished!'));
     return;
 }
 
 sub table_names {
-    my $cid = $ENV{'request.course.id'};
-    my $domain = $ENV{'course.'.$cid.'.domain'};
-    my $home = $ENV{'course.'.$cid.'.home'};
-    my $course = $ENV{'course.'.$cid.'.num'};
+    my $cid = $env{'request.course.id'};
+    my $domain = $env{'course.'.$cid.'.domain'};
+    my $home = $env{'course.'.$cid.'.home'};
+    my $course = $env{'course.'.$cid.'.num'};
     my $prefix = $course.'_'.$domain.'_';
     #
     my %tables = 
@@ -132,7 +151,7 @@ sub get_max_time_in_db {
     my %table = &table_names();
     my $query = qq{SELECT MAX(time) FROM $table{'activity'} };
     #
-    my $home = $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+    my $home = $env{'course.'.$env{'request.course.id'}.'.home'};
     my $reply=&Apache::lonnet::metadata_query($query,undef,undef,[$home]);
     if (ref($reply) ne 'HASH') {
         return undef;
@@ -175,7 +194,7 @@ sub get_max_time_in_db {
     my $timestr = '';
     while (my $line = <TIMEDATA>) {
         chomp($line);
-        $timestr = &Apache::lonnet::unescape($line);
+        $timestr = &unescape($line);
     }
     close(TIMEDATA);
     return &Apache::lonmysql::unsqltime($timestr);
@@ -183,11 +202,12 @@ sub get_max_time_in_db {
 
 sub build_query {
     my ($mode) = @_;
-    my $cid = $ENV{'request.course.id'};
-    my $domain = $ENV{'course.'.$cid.'.domain'};
-    my $home = $ENV{'course.'.$cid.'.home'};
-    my $course = $ENV{'course.'.$cid.'.num'};
+    my $cid = $env{'request.course.id'};
+    my $domain = $env{'course.'.$cid.'.domain'};
+    my $home = $env{'course.'.$cid.'.home'};
+    my $course = $env{'course.'.$cid.'.num'};
     my $prefix = $course.'_'.$domain.'_';
+    my $start = ($env{'form.start'}+0);
     #
     my %table = &table_names();
     #
@@ -200,7 +220,7 @@ sub build_query {
             LEFT JOIN $table{'student'}  AS C ON C.student_id=A.student_id 
             LEFT JOIN $table{'machine'}  AS E ON E.machine_id=A.machine_id
             ORDER BY A.time DESC
-            LIMIT 500
+            LIMIT $start, $num_records
         };
     } elsif ($mode =~ /^student:(.*):(.*)$/) {
         my $student = $1.':'.$2;
@@ -212,7 +232,7 @@ sub build_query {
                 LEFT JOIN $table{'machine'}  AS E ON E.machine_id=A.machine_id
                 WHERE C.student='$student'
                 ORDER BY A.time DESC
-                LIMIT 500
+                LIMIT $start, $num_records
             };
     }
     $query =~ s|$/||g;
@@ -227,8 +247,8 @@ sub output_results {
     ##
     if (! -s $results_file) {
         # results file is empty, just let them know there is no data
-        $r->print('<h2>'.&mt('No data was returned for your request').'</h2>');
-        return;
+        $r->print('<h2>'.&mt('So far, no data has been returned for your request').'</h2>');
+        return -1;
     }
     if (! open(ACTIVITYDATA,$results_file)) {
         $r->print('<h2>'.&mt('Unable to read results file.').'</h2>'.
@@ -237,7 +257,7 @@ sub output_results {
                       'You should contact your system administrator '.
                       'to resolve this issue.').
                   '</p>');
-        return;
+        return -2;
     }
     ##
     ##
@@ -262,14 +282,14 @@ sub output_results {
             '<th align="left">'.&mt('Data').'</th>'.
             '</tr>'.$/;
     }
-    my $count = -1;
+    my $count = $env{'form.start'}-1;
     $r->rflush();
     ##
     ##
     while (my $line = <ACTIVITYDATA>) {
         # FIXME: does not pass symbs along :(
         chomp($line);
-        $line = &Apache::lonnet::unescape($line);
+        $line = &unescape($line);
         if (++$count % 50 == 0) {
             if ($count != 0) { 
                 $r->print('</table>'.$/);
@@ -284,7 +304,7 @@ sub output_results {
             ($symb,$timestamp,$action,$machine,$values) = split(',',$line,5);
         }
 	foreach ($symb,$timestamp,$student,$action,$machine) {
-	    $_=&Apache::lonnet::unescape($_);
+	    $_=&unescape($_);
 	}
         my ($title,$src);
         if ($symb =~ m:^/adm/:) {
@@ -296,10 +316,11 @@ sub output_results {
                 $title = $nav_res->compTitle();
                 $src   = $nav_res->src();
             } else {
-                if ($src =~ m|^/res|) {
-                    $title = $src;
-                } elsif ($values =~ /^\s*$/ && 
-                         (! defined($src) || $src =~ /^\s*$/)) {
+		$src = $symb;
+		if ($src !~ m{/adm}) {
+		    $title = &Apache::lonnet::gettitle($src);
+		} elsif ($values =~ /^\s*$/ && 
+		    (! defined($src) || $src =~ /^\s*$/)) {
                     next;
                 } elsif ($values =~ /^\s*$/) {
                     $values = $src;
@@ -336,7 +357,7 @@ sub output_results {
 	$values = &display_values($action,$values);
         #
         # Build the row for output
-        my $tablerow = qq{<tr class="$class">};
+        my $tablerow = qq{<tr class="$class"><td>}.($count+1).qq{</td>};
         if ($src =~ m|^/adm/|) {
             $tablerow .= 
                 '<td valign="top"><nobr>'.$title.'</nobr></td>';
@@ -357,9 +378,9 @@ sub output_results {
             '</tr>';
         $r->print($tablerow.$/);
     }
-    $r->print('</table>'.$/) if (! $count % 50);
+    $r->print('</table>'.$/);### if (! $count % 50);
     close(ACTIVITYDATA);
-    return;
+    return $count;
 }
 
 ###################################################################
@@ -371,14 +392,17 @@ sub display_values {
 	my %values=map {split('=',$_,-1)} split(/\&/,$values);
 	foreach my $key (sort(keys(%values))) {
 	    $result.='<tr><td align="right">'.
-		&Apache::lonnet::unescape($key).
+		&unescape($key).
 		'</td><td>=</td><td align="left">'.
-		&Apache::lonnet::unescape($values{$key}).'</td></tr>';
+		&unescape($values{$key}).'</td></tr>';
 	}
 	$result.='</table>';
     } elsif ($action eq 'POST') {
-	my %values=
-	    map {split('=',&Apache::lonnet::unescape($_),-1)} split(/\&/,$values);
+	my %values;
+        foreach my $pair (split(/\&/,$values)) {
+            my ($key,$value) = split('=',&unescape($pair),-1);
+            $values{$key} = $value;
+        }
 	foreach my $key (sort(keys(%values))) {
 	    if ($key eq 'counter') { next; }
 	    $result.='<tr><td align="right">'.$key.'</td>'.
@@ -386,7 +410,7 @@ sub display_values {
 	}
 	$result.='</table>';
     } else {
-	$result=&Apache::lonnet::unescape($values)
+	$result=&unescape($values)
     }
     return $result;
 }
@@ -394,10 +418,10 @@ sub display_values {
 ###################################################################
 sub request_data_update {
     my $command = 'prepare activity log';
-    my $cid = $ENV{'request.course.id'};
-    my $domain = $ENV{'course.'.$cid.'.domain'};
-    my $home = $ENV{'course.'.$cid.'.home'};
-    my $course = $ENV{'course.'.$cid.'.num'};
+    my $cid = $env{'request.course.id'};
+    my $domain = $env{'course.'.$cid.'.domain'};
+    my $home = $env{'course.'.$cid.'.home'};
+    my $course = $env{'course.'.$cid.'.num'};
 #    &Apache::lonnet::logthis($command.' '.$course.' '.$domain.' '.$home);
     my $result = &Apache::lonnet::metadata_query($command,$course,$domain,
                                                  [$home]);
@@ -463,18 +487,18 @@ sub handler {
     $loaderror=
         &Apache::lonnet::overloaderror
         ($r,
-         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+         $env{'course.'.$env{'request.course.id'}.'.home'});
     if ($loaderror) { return $loaderror; }
     #
     # Check for access
-    if (! &Apache::lonnet::allowed('vsa',$ENV{'request.course.id'})) {
-        $ENV{'user.error.msg'}=
+    if (! &Apache::lonnet::allowed('vsa',$env{'request.course.id'})) {
+        $env{'user.error.msg'}=
             $r->uri.":vsa:0:0:Cannot student activity for complete course";
         if (! 
             &Apache::lonnet::allowed('vsa',
-                                     $ENV{'request.course.id'}.'/'.
-                                     $ENV{'request.course.sec'})) {
-            $ENV{'user.error.msg'}=
+                                     $env{'request.course.id'}.'/'.
+                                     $env{'request.course.sec'})) {
+            $env{'user.error.msg'}=
                 $r->uri.":vsa:0:0:Cannot view student activity with given role";
             return HTTP_NOT_ACCEPTABLE;
         }
@@ -488,7 +512,7 @@ sub handler {
     #
     # Extract form elements from query string
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['selected_student']);
+                                            ['selected_student','start']);
     #
     # We will almost always need this...
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -501,12 +525,8 @@ sub handler {
                                             bug=>'instructor interface'});
     #
     # Give the LON-CAPA page header
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print($html.'<head>'.&styles().'<title>'.
-              &mt('Student Activity').
-              "</title></head>\n".
-              &Apache::loncommon::bodytag('Student Activity').
-              &Apache::lonhtmlcommon::breadcrumbs(undef,'Student Activity'));
+    $r->print(&Apache::loncommon::start_page('Student Activity',&styles()).
+              &Apache::lonhtmlcommon::breadcrumbs('Student Activity'));
     $r->rflush();
     #
     # Begin form output
@@ -526,22 +546,23 @@ sub handler {
     #
     my $result = &request_data_update();
     #
-    if (exists($ENV{'form.selected_student'})) {
+    if (exists($env{'form.selected_student'})) {
         # For now, just show all the data, in the future allow selection of
         # a student
-        my ($sname,$sdom) = split(':',$ENV{'form.selected_student'});
-        if ($sname =~ /^\w*$/ && $sdom =~ /^\w*$/) {
+        my ($sname,$sdom) = split(':',$env{'form.selected_student'});
+        if ($sname =~ /^$LONCAPA::username_re$/ 
+	    && $sdom =~ /^$LONCAPA::domain_re$/) {
             $r->print('<h2>'.
-                      &mt('Recent activity of [_1]@[_2]',$sname,$sdom).
+                      &mt('Recent activity of [_1]:[_2]',$sname,$sdom).
                       '</h2>');
             $r->print('<p>'.&mt(<<END).'</p>');
 Compiling student activity data can take a long time.
-It may be necessary to reload this page to get the most current information.
+Your request continues to be processed while results are displayed.
 END
             &get_data($r,\%prog_state,$navmap,
-                      'student:'.$ENV{'form.selected_student'});
+                      'student:'.$env{'form.selected_student'});
         } else {
-            $r->print('<h2>'.&mt('Unable to process for [_1]@[_2]',
+            $r->print('<h2>'.&mt('Unable to process for [_1]:[_2]',
                                  $sname,$sdom).'</h2>');
         }
     } else {
@@ -553,7 +574,7 @@ END
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     #
     $r->print("</form>\n");
-    $r->print("</body>\n</html>\n");
+    $r->print(&Apache::loncommon::end_page());
     $r->rflush();
     #
     return OK;