--- loncom/homework/lonmaxima.pm	2006/06/12 13:51:13	1.3
+++ loncom/homework/lonmaxima.pm	2006/06/13 14:57:54	1.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Interface routines to MAXIMA CAS
 #
-# $Id: lonmaxima.pm,v 1.3 2006/06/12 13:51:13 bisitz Exp $
+# $Id: lonmaxima.pm,v 1.5 2006/06/13 14:57:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ package Apache::lonmaxima;
 use strict;
 use IO::Socket;
 use Apache::lonnet;
+use LONCAPA;
 
 sub connect {
    return IO::Socket::UNIX->new(Peer    => $Apache::lonnet::perlvar{'lonSockDir'}.'/maximasock',
@@ -46,11 +47,11 @@ sub disconnect {
 sub maximareply {
     my ($socket,$cmd)=@_;
     if ($socket) {
-	print $socket &Apache::lonnet::escape($cmd)."\n";
+	print $socket &escape($cmd)."\n";
         my $reply=<$socket>;
         chomp($reply);
         if ($reply=~/^Incorrect/) { $reply='Error: '.$reply; }
-        return &Apache::lonnet::unescape($reply);
+        return &unescape($reply);
     } else {
         return 'Error: no connection.';
     }
@@ -75,13 +76,11 @@ sub compareterms {
 }
 
 sub maxima_check {
-    my ($response,$answer,$type,
-        $tol_type,$tol,
-        $sig_lbound,$sig_ubound,
-        $ans_fmt,$unit,$calc,$id_list,
-        $points,
-        $randomseed,
-        $reterror) = @_;
+    my ($response,$answer,$reterror) = @_;
+    my $socket=&connect();
+    my $reply=&compareterms($socket,$response,$answer);
+    &disconnect($socket);
+    if ($reply eq 'true') { return 1; }
     return 7;
 }