--- loncom/homework/lonmaxima.pm	2006/03/11 16:28:03	1.1
+++ 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.1 2006/03/11 16:28:03 www 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.';
     }
@@ -59,7 +60,7 @@ sub maximareply {
 sub blacklisted {
     my ($cmd)=@_;
     foreach my $forbidden ('save','load','plot','lisp','includ','compil','file','batch','stringout','translat','stout','stin','block','system') {
-	if ($cmd=~/$forbidden/) { return 1; }
+	if ($cmd=~/$forbidden/s) { return 1; }
     } 
     return 0;
 }
@@ -73,6 +74,15 @@ sub compareterms {
     if ($reply=~/^Error\:/) { return $reply; }
     return 'false';
 }
+
+sub maxima_check {
+    my ($response,$answer,$reterror) = @_;
+    my $socket=&connect();
+    my $reply=&compareterms($socket,$response,$answer);
+    &disconnect($socket);
+    if ($reply eq 'true') { return 1; }
+    return 7;
+}
  
 1;
 __END__;