--- loncom/interface/lontrackstudent.pm	2004/10/05 13:40:16	1.7
+++ loncom/interface/lontrackstudent.pm	2004/12/22 22:54:59	1.11
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lontrackstudent.pm,v 1.7 2004/10/05 13:40:16 matthew Exp $
+# $Id: lontrackstudent.pm,v 1.11 2004/12/22 22:54:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,6 +47,7 @@ use Apache::Constants qw(:common :http);
 use Apache::lonnet();
 use Apache::lonlocal;
 use Time::HiRes;
+use Time::Local;
 
 sub get_data {
     my ($r,$prog_state,$navmap,$mode) = @_;
@@ -55,8 +56,20 @@ 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 goes to [_1]',
+                             &Apache::lonlocal::locallocaltime($max_time)).
+                  '</h3>');
+        $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'};
@@ -88,19 +101,93 @@ 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);
     &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 => $prefix.'students',
+          res     => $prefix.'resource',
+          machine => $prefix.'machine_table',
+          activity=> $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 = &Apache::lonnet::unescape($line);
+    }
+    close(TIMEDATA);
+    my ($year,$month,$day,$hour,$min,$sec) = 
+        ($timestr =~ /^(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)/);
+    $month -= 1; # Good old timelocal
+    my $max_time = undef;
+    if (eval("&timelocal($sec,$min,$hour,$day,$month,$year)")) {
+        $max_time = &timelocal($sec,$min,$hour,$day,$month,$year);
+    }
+    return $max_time;
+}
+
 sub build_query {
     my ($mode) = @_;
     my $cid = $ENV{'request.course.id'};
@@ -109,21 +196,16 @@ sub build_query {
     my $course = $ENV{'course.'.$cid.'.num'};
     my $prefix = $course.'_'.$domain.'_';
     #
-    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
         };
@@ -131,10 +213,10 @@ sub build_query {
         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
@@ -187,6 +269,7 @@ sub output_results {
     ##
     ##
     while (my $line = <ACTIVITYDATA>) {
+        # FIXME: does not pass symbs along :(
         chomp($line);
         $line = &Apache::lonnet::unescape($line);
         if (++$count % 50 == 0) {
@@ -198,12 +281,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) {
+	    $_=&Apache::lonnet::unescape($_);
+	}
         my ($title,$src);
         if ($symb =~ m:^/adm/:) {
             $title = $symb;
@@ -211,7 +295,7 @@ 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|) {
@@ -251,27 +335,27 @@ 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">};
         if ($src =~ m|^/adm/|) {
             $tablerow .= 
-                '<td><nobr>'.$title.'</td>';
+                '<td valign="top"><nobr>'.$title.'</nobr></td>';
         } else {
             $tablerow .= 
-                '<td><nobr>'.
+                '<td valign="top"><nobr>'.
                 '<a href="'.$src.'">'.$title.'</a>'.
                 '</nobr></td>';
         }
-        $tablerow .= '<td><nobr>'.$timestamp.'</nobr></td>';
+        $tablerow .= '<td valign="top"><nobr>'.$timestamp.'</nobr></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.$/);
     }
@@ -282,6 +366,34 @@ sub output_results {
 
 ###################################################################
 ###################################################################
+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">'.
+		&Apache::lonnet::unescape($key).
+		'</td><td>=</td><td align="left">'.
+		&Apache::lonnet::unescape($values{$key}).'</td></tr>';
+	}
+	$result.='</table>';
+    } elsif ($action eq 'POST') {
+	my %values=
+	    map {split('=',&Apache::lonnet::unescape($_),-1)} split(/\&/,$values);
+	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=&Apache::lonnet::unescape($values)
+    }
+    return $result;
+}
+###################################################################
+###################################################################
 sub request_data_update {
     my $command = 'prepare activity log';
     my $cid = $ENV{'request.course.id'};
@@ -426,6 +538,10 @@ sub handler {
             $r->print('<h2>'.
                       &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.
+END
             &get_data($r,\%prog_state,$navmap,
                       'student:'.$ENV{'form.selected_student'});
         } else {