'.
+ &mt('This is a serious error and has been logged. '.
+ 'You should contact your system administrator '.
+ 'to resolve this issue.').
+ '
');
+ return;
+ }
+ #
+ my $timestr = '';
+ while (my $line = ) {
+ chomp($line);
+ $timestr = &Apache::lonnet::unescape($line);
+ }
+ close(TIMEDATA);
+ return &Apache::lonmysql::unsqltime($timestr);
+}
+
sub build_query {
my ($mode) = @_;
my $cid = $ENV{'request.course.id'};
@@ -111,21 +189,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
};
@@ -133,10 +206,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
@@ -152,6 +225,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(''.&mt('No data was returned for your request').'
');
+ return;
+ }
if (! open(ACTIVITYDATA,$results_file)) {
$r->print(''.&mt('Unable to read results file.').'
'.
''.
@@ -189,6 +267,7 @@ sub output_results {
##
##
while (my $line = ) {
+ # FIXME: does not pass symbs along :(
chomp($line);
$line = &Apache::lonnet::unescape($line);
if (++$count % 50 == 0) {
@@ -200,12 +279,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;
@@ -213,7 +293,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|) {
@@ -253,27 +333,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{};
if ($src =~ m|^/adm/|) {
$tablerow .=
- '| '.$title.' | ';
+ ''.$title.' | ';
} else {
$tablerow .=
- ''.
+ '| '.
''.$title.''.
' | ';
}
- $tablerow .= ''.$timestamp.' | ';
+ $tablerow .= ''.$timestamp.' | ';
if ($mode eq 'full_class') {
- $tablerow.=''.$student.' | ';
+ $tablerow.=''.$student.' | ';
}
$tablerow .=
- ''.$action.' | '.
+ ''.$action.' | '.
# ''.$machine.' | '.
- ''.$values.' | '.
+ ''.$values.' | '.
' |
';
$r->print($tablerow.$/);
}
@@ -284,6 +364,34 @@ sub output_results {
###################################################################
###################################################################
+sub display_values {
+ my ($action,$values)=@_;
+ my $result='';
+ if ($action eq 'CSTORE') {
+ my %values=map {split('=',$_,-1)} split(/\&/,$values);
+ foreach my $key (sort(keys(%values))) {
+ $result.='| '.
+ &Apache::lonnet::unescape($key).
+ ' | = | '.
+ &Apache::lonnet::unescape($values{$key}).' |
';
+ }
+ $result.='
';
+ } 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.='| '.$key.' | '.
+ '= | '.$values{$key}.' |
';
+ }
+ $result.='';
+ } else {
+ $result=&Apache::lonnet::unescape($values)
+ }
+ return $result;
+}
+###################################################################
+###################################################################
sub request_data_update {
my $command = 'prepare activity log';
my $cid = $ENV{'request.course.id'};
@@ -416,9 +524,6 @@ 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'})) {
# For now, just show all the data, in the future allow selection of