--- loncom/interface/lontrackstudent.pm	2006/05/01 19:37:34	1.19
+++ loncom/interface/lontrackstudent.pm	2006/05/30 12:46:09	1.20
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lontrackstudent.pm,v 1.19 2006/05/01 19:37:34 albertel Exp $
+# $Id: lontrackstudent.pm,v 1.20 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,8 @@ use Apache::lonmysql;
 use Apache::lonnet;
 use Apache::lonlocal;
 use Time::HiRes;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 my $num_records=500;
 
@@ -183,7 +185,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);
@@ -278,7 +280,7 @@ sub output_results {
     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>'.$/);
@@ -293,7 +295,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/:) {
@@ -380,14 +382,14 @@ 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);
+	    map {split('=',&unescape($_),-1)} split(/\&/,$values);
 	foreach my $key (sort(keys(%values))) {
 	    if ($key eq 'counter') { next; }
 	    $result.='<tr><td align="right">'.$key.'</td>'.
@@ -395,7 +397,7 @@ sub display_values {
 	}
 	$result.='</table>';
     } else {
-	$result=&Apache::lonnet::unescape($values)
+	$result=&unescape($values)
     }
     return $result;
 }