Diff for /loncom/homework/lonmaxima.pm between versions 1.6 and 1.7

version 1.6, 2006/12/11 17:37:43 version 1.7, 2006/12/11 22:02:13
Line 68  sub blacklisted { Line 68  sub blacklisted {
 sub runscript {  sub runscript {
     my ($socket,$fullscript)=@_;      my ($socket,$fullscript)=@_;
     if (&blacklisted($fullscript)) { return 'Error: blacklisted'; }      if (&blacklisted($fullscript)) { return 'Error: blacklisted'; }
     return &maximareply($socket,$fullscript);      my $reply;
       $fullscript=~s/[\n\r\l]//gs;
       foreach my $line (split(/\;/s,$fullscript)) {
    if ($line=~/\w/) { $reply=&maximareply($socket,$line.";\n"); }
    if ($reply=~/^Error\:/) { return $reply; }
       }
       $reply=~s/\W//gs;
       return $reply;
 }  }
   
 sub maxima_run {  sub maxima_run {
     my ($script,$submission,$arguments) = @_;      my ($script,$submission,$argument) = @_;
     my $socket=&connect();      my $socket=&connect();
     my $fullscript=$script;      my $fullscript='';
       my $submission_index=1;
       foreach my $submission_component (split(/\s*\,\s*/,$submission)) {
    $fullscript.="RESPONSE[$submission_index]:$submission_component;\n";
    $submission_index++;
       }
       my $argument_index=1;
       foreach my $argument_component (split(/\s*\,\s*/,$argument)) {
    $fullscript.="LONCAPALIST[$argument_index]:$argument_component;\n";
    $argument_index++;
       }
       $fullscript.=$script;
     my $reply=&runscript($socket,$fullscript);      my $reply=&runscript($socket,$fullscript);
 #    &Apache::lonnet::logthis('Script:'.$fullscript);  
 #    &Apache::lonnet::logthis('Sub:'.$submission);  
 #    &Apache::lonnet::logthis('Arg:'.$arguments);  
   
     &disconnect($socket);      &disconnect($socket);
     if ($reply=~/^\s*true\s*$/) { return 'EXACT_ANS'; }      if ($reply=~/^\s*true\s*$/) { return 'EXACT_ANS'; }
     if ($reply=~/^\s*false\s*/) { return 'INCORRECT'; }       if ($reply=~/^\s*false\s*/) { return 'INCORRECT'; } 

Removed from v.1.6  
changed lines
  Added in v.1.7


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>