--- loncom/interface/spreadsheet/studentcalc.pm	2006/04/06 20:24:13	1.38
+++ loncom/interface/spreadsheet/studentcalc.pm	2006/12/21 02:54:19	1.42
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.38 2006/04/06 20:24:13 raeburn Exp $
+# $Id: studentcalc.pm,v 1.42 2006/12/21 02:54:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,6 +59,9 @@ use Apache::assesscalc();
 use HTML::Entities();
 use Time::HiRes;
 use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 @Apache::studentcalc::ISA = ('Apache::Spreadsheet');
 
@@ -292,7 +295,7 @@ END
                     '<a href="/adm/assesscalc?sname='.$self->{'name'}.
                     '&sdomain='.$self->{'domain'}.
                     '&filename='.$assess_filename.
-                    '&usymb='.&Apache::lonnet::escape($resource->symb).
+                    '&usymb='.&escape($resource->symb).
                     '">'.$resource->compTitle.'</a><br />';
                 $row_output .= &assess_file_selector($rownum,
                                                      $assess_filename,
@@ -300,7 +303,7 @@ END
                                                          '</td>';
             } else {
                 $row_output .= '<td><a href="'.$resource->src.'?symb='.
-                    &Apache::lonnet::escape($resource->symb).
+                    &escape($resource->symb).
                     '">Go&nbsp;To</a>';
                 $row_output .= '</td><td>'.$resource->compTitle.'</td>';
             }
@@ -397,6 +400,8 @@ sub modify_cell {
         $self->set_formula($cell,$formula);
     } elsif ($cell !~ /^([A-z](\d+)|template_[A-z])$/) {
         return;
+    } else {
+        $self->set_formula($cell,$formula);
     }
     $self->rebuild_stats();
     return;
@@ -549,7 +554,7 @@ sub compute {
     }
     $self->initialize_safe_space();
     &Apache::assesscalc::initialize_package($self->{'name'},$self->{'domain'},
-                                            $navmap);
+                                            $navmap,$self);
     my %f = $self->formulas();
     #
     # Process the formulas list - 
@@ -572,7 +577,7 @@ sub compute {
                                                        $assess_filename,
                                                        $resource->symb,
 						       $self->{'section'},
-                                                       $self->{'group'});
+                                                       $self->{'groups'});
             my @exportdata = $assessSheet->export_data($r);
             #
             if ($assessSheet->badcalc()) {