--- loncom/homework/lonmaxima.pm	2006/06/12 14:22:01	1.4
+++ loncom/homework/lonmaxima.pm	2006/12/11 17:37:43	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Interface routines to MAXIMA CAS
 #
-# $Id: lonmaxima.pm,v 1.4 2006/06/12 14:22:01 bisitz Exp $
+# $Id: lonmaxima.pm,v 1.6 2006/12/11 17:37:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,6 +65,27 @@ sub blacklisted {
     return 0;
 }
 
+sub runscript {
+    my ($socket,$fullscript)=@_;
+    if (&blacklisted($fullscript)) { return 'Error: blacklisted'; }
+    return &maximareply($socket,$fullscript);
+}
+
+sub maxima_run {
+    my ($script,$submission,$arguments) = @_;
+    my $socket=&connect();
+    my $fullscript=$script;
+    my $reply=&runscript($socket,$fullscript);
+#    &Apache::lonnet::logthis('Script:'.$fullscript);
+#    &Apache::lonnet::logthis('Sub:'.$submission);
+#    &Apache::lonnet::logthis('Arg:'.$arguments);
+
+    &disconnect($socket);
+    if ($reply=~/^\s*true\s*$/) { return 'EXACT_ANS'; }
+    if ($reply=~/^\s*false\s*/) { return 'INCORRECT'; } 
+    return 'BAD_FORMULA';
+}
+
 sub compareterms {
     my ($socket,$terma,$termb)=@_;
     my $difference=$terma.'-'.$termb;
@@ -76,13 +97,7 @@ 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);