--- loncom/interface/lontrackstudent.pm	2004/08/29 19:58:32	1.6
+++ loncom/interface/lontrackstudent.pm	2008/12/11 14:55:15	1.24
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lontrackstudent.pm,v 1.6 2004/08/29 19:58:32 matthew Exp $
+# $Id: lontrackstudent.pm,v 1.24 2008/12/11 14:55:15 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,9 +44,14 @@ package Apache::lontrackstudent;
 
 use strict;
 use Apache::Constants qw(:common :http);
-use Apache::lonnet();
+use Apache::lonmysql;
+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) = @_;
@@ -55,11 +60,23 @@ sub get_data {
     &Apache::lonhtmlcommon::Update_PrgWin
         ($r,$prog_state,&mt('Composing Query'));
     #
+    # Allow the other server to begin processing the data before we ask for it.
+    sleep(5);
+    #
+    my $max_time = &get_max_time_in_db($r,$prog_state);
+    if (defined($max_time)) {
+        $r->print('<h3>'.&mt('Activity data compiled up to [_1]',
+                             &Apache::lonlocal::locallocaltime($max_time)).
+                  '</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>');
+        return;
+    }
     my $query = &build_query($mode);
-    &Apache::lonnet::logthis('sending query '.$query);
     ##
     ## 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>'.
@@ -88,56 +105,134 @@ sub get_data {
         $r->print(&mt('Please try again in a few minutes.'));
         return;
     }
-#    $r->print('<h2>'.&mt('Elapsed Time = [_1] seconds',
-#                         time-$starttime).'</h2>');
     $r->rflush();
+    #
     &Apache::lonhtmlcommon::Update_PrgWin
         ($r,$prog_state,&mt('Parsing results'));
-#    $r->print('<h2>'.
-#              &mt('Reloading this page may result in newer data').
-#              '</h2>');
-    &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 $prefix = $course.'_'.$domain.'_';
+    #
+    my %tables = 
+        ( student =>&Apache::lonmysql::fix_table_name($prefix.'students'),
+          res     =>&Apache::lonmysql::fix_table_name($prefix.'resource'),
+          machine =>&Apache::lonmysql::fix_table_name($prefix.'machine_table'),
+          activity=>&Apache::lonmysql::fix_table_name($prefix.'activity'),
+          );
+    return %tables;
+}
+
+sub get_max_time_in_db {
+    my ($r,$prog_state) = @_;
+    my %table = &table_names();
+    my $query = qq{SELECT MAX(time) FROM $table{'activity'} };
+    #
+    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;
+    }
+    my $results_file = $r->dir_config('lonDaemons').'/tmp/'.$reply->{$home};
+    my $endfile = $results_file.'.end';
+    ##
+    ## Check for the results
+    &Apache::lonhtmlcommon::Update_PrgWin
+        ($r,$prog_state,&mt('Waiting for results'));
+    my $maxtime = 500;
+    my $starttime = time;
+    while (! -e $endfile && (time-$starttime < $maxtime)) {
+        &Apache::lonhtmlcommon::Update_PrgWin
+            ($r,$prog_state,&mt('Waiting up to [_1] seconds for results',
+                                $starttime+$maxtime-time));
+        sleep(1);
+    }
+    if (! -e $endfile) {
+        $r->print('<h2>'.
+                  &mt('Unable to retrieve data.').'</h2>');
+        $r->print(&mt('Please try again in a few minutes.'));
+        return undef;
+    }
+    $r->rflush();
+    #
+    &Apache::lonhtmlcommon::Update_PrgWin
+        ($r,$prog_state,&mt('Parsing results'));
+    #
+    if (! open(TIMEDATA,$results_file)) {
+        $r->print('<h2>'.&mt('Unable to read results file.').'</h2>'.
+                  '<p>'.
+                  &mt('This is a serious error and has been logged.  '.
+                      'You should contact your system administrator '.
+                      'to resolve this issue.').
+                  '</p>');
+        return;
+    }
+    #
+    my $timestr = '';
+    while (my $line = <TIMEDATA>) {
+        chomp($line);
+        $timestr = &unescape($line);
+    }
+    close(TIMEDATA);
+    return &Apache::lonmysql::unsqltime($timestr);
+}
+
 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 $student_table  = $prefix.'students';
-    my $res_table      = $prefix.'resource';
-    my $action_table   = $prefix.'actions';
-    my $machine_table  = $prefix.'machine_table';
-    my $activity_table = $prefix.'activity';
+    my %table = &table_names();
     #
     my $query;
     if ($mode eq 'full_class') {
         $query = qq{
         SELECT B.resource,A.time,C.student,A.action,E.machine,A.action_values 
-            FROM $activity_table AS A
-            LEFT JOIN $res_table      AS B ON B.res_id=A.res_id 
-            LEFT JOIN $student_table  AS C ON C.student_id=A.student_id 
-            LEFT JOIN $machine_table  AS E ON E.machine_id=A.machine_id
-            WHERE A.student_id>10
+            FROM $table{'activity'} AS A
+            LEFT JOIN $table{'res'}      AS B ON B.res_id=A.res_id 
+            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;
         $query = qq{
             SELECT B.resource,A.time,A.action,E.machine,A.action_values 
-                FROM $activity_table AS A
-                LEFT JOIN $res_table      AS B ON B.res_id=A.res_id 
-                LEFT JOIN $student_table  AS C ON C.student_id=A.student_id 
-                LEFT JOIN $machine_table  AS E ON E.machine_id=A.machine_id
+                FROM $table{'activity'} AS A
+                LEFT JOIN $table{'res'}      AS B ON B.res_id=A.res_id 
+                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
                 WHERE C.student='$student'
                 ORDER BY A.time DESC
-                LIMIT 500
+                LIMIT $start, $num_records
             };
     }
     $query =~ s|$/||g;
@@ -150,6 +245,11 @@ sub output_results {
     my ($r,$results_file,$navmap,$mode) = @_;
     ##
     ##
+    if (! -s $results_file) {
+        # results file is empty, just let them know there is no data
+        $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>'.
                   '<p>'.
@@ -157,7 +257,7 @@ sub output_results {
                       'You should contact your system administrator '.
                       'to resolve this issue.').
                   '</p>');
-        return;
+        return -2;
     }
     ##
     ##
@@ -182,13 +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>'.$/);
@@ -198,12 +299,13 @@ sub output_results {
         }
         my ($symb,$timestamp,$student,$action,$machine,$values);
         if ($mode eq 'full_class') {
-            ($symb,$timestamp,$student,$action,$machine,$values) =
-                map { &Apache::lonnet::unescape($_); } split(',',$line,6);
+            ($symb,$timestamp,$student,$action,$machine,$values) = split(',',$line,6);
         } else {
-            ($symb,$timestamp,$action,$machine,$values) =
-                map { &Apache::lonnet::unescape($_); } split(',',$line,5);
+            ($symb,$timestamp,$action,$machine,$values) = split(',',$line,5);
         }
+	foreach ($symb,$timestamp,$student,$action,$machine) {
+	    $_=&unescape($_);
+	}
         my ($title,$src);
         if ($symb =~ m:^/adm/:) {
             $title = $symb;
@@ -211,13 +313,14 @@ sub output_results {
         } else {
             my $nav_res = $navmap->getBySymb($symb);
             if (defined($nav_res)) {
-                $title = $nav_res->title();
+                $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;
@@ -251,43 +354,74 @@ sub output_results {
             $class = 'warning';
         }
         # Clean up the values
-        $values =~ s/counter=\d+$//;
+	$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><nobr>'.$title.'</td>';
+                '<td valign="top"><span class="LC_nobreak">'.$title.'</span></td>';
         } else {
             $tablerow .= 
-                '<td><nobr>'.
+                '<td valign="top"><span class="LC_nobreak">'.
                 '<a href="'.$src.'">'.$title.'</a>'.
-                '</nobr></td>';
+                '</span></td>';
         }
-        $tablerow .= '<td><nobr>'.$timestamp.'</nobr></td>';
+        $tablerow .= '<td valign="top"><span class="LC_nobreak">'.$timestamp.'</span></td>';
         if ($mode eq 'full_class') {
-            $tablerow.='<td>'.$student.'</td>';
+            $tablerow.='<td valign="top">'.$student.'</td>';
         }
         $tablerow .= 
-            '<td>'.$action.'</td>'.
+            '<td valign="top">'.$action.'</td>'.
 #            '<td>'.$machine.'</td>'.
-            '<td>'.$values.'</td>'.
+            '<td valign="top">'.$values.'</td>'.
             '</tr>';
         $r->print($tablerow.$/);
     }
-    $r->print('</table>'.$/) if (! $count % 50);
+    $r->print('</table>'.$/);### if (! $count % 50);
     close(ACTIVITYDATA);
-    return;
+    return $count;
 }
 
 ###################################################################
 ###################################################################
+sub display_values {
+    my ($action,$values)=@_;
+    my $result='<table>';
+    if ($action eq 'CSTORE') {
+	my %values=map {split('=',$_,-1)} split(/\&/,$values);
+	foreach my $key (sort(keys(%values))) {
+	    $result.='<tr><td align="right">'.
+		&unescape($key).
+		'</td><td>=</td><td align="left">'.
+		&unescape($values{$key}).'</td></tr>';
+	}
+	$result.='</table>';
+    } elsif ($action eq 'POST') {
+	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>'.
+		'<td>=</td><td align="left">'.$values{$key}.'</td></tr>';
+	}
+	$result.='</table>';
+    } else {
+	$result=&unescape($values)
+    }
+    return $result;
+}
+###################################################################
+###################################################################
 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]);
@@ -328,6 +462,7 @@ sub developer_centric_styles {
     tr.warning   { background-color: red; }
     tr.chat      { background-color: yellow; }
     tr.chatfetch { background-color: yellow; }
+    tr.evaluate  { background-color: red; }
     tr.navmaps   { background-color: \#777777; }
     tr.roles     { background-color: \#999999; }
     tr.flip      { background-color: \#BBBBBB; }
@@ -352,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;
         }
@@ -377,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();
@@ -390,11 +525,8 @@ sub handler {
                                             bug=>'instructor interface'});
     #
     # Give the LON-CAPA page header
-    $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
@@ -413,22 +545,24 @@ sub handler {
         ($r,\%prog_state,&mt('Contacting course home server'));
     #
     my $result = &request_data_update();
-    if (ref($result) eq 'HASH') {
-        $result = join(' ',map { $_.'=>'.$result->{$_}; } keys(%$result));
-    }
     #
-    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.
+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 {
@@ -440,7 +574,7 @@ sub handler {
     &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;