--- loncom/interface/spreadsheet/Spreadsheet.pm 2006/05/01 06:17:16 1.68 +++ loncom/interface/spreadsheet/Spreadsheet.pm 2006/05/30 12:46:26 1.69 @@ -1,5 +1,5 @@ # -# $Id: Spreadsheet.pm,v 1.68 2006/05/01 06:17:16 raeburn Exp $ +# $Id: Spreadsheet.pm,v 1.69 2006/05/30 12:46:26 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,6 +60,9 @@ use HTML::TokeParser; use Spreadsheet::WriteExcel; use Time::HiRes; use Apache::lonlocal; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + ## ## Package Variables @@ -1815,8 +1818,8 @@ sub save_tmp { my %f = $self->formulas(); while( my ($cell,$formula) = each(%f)) { next if ($formula eq 'import'); - print $fh &Apache::lonnet::escape($cell)."=". - &Apache::lonnet::escape($formula)."\n"; + print $fh &escape($cell)."=". + &escape($formula)."\n"; } $fh->close(); } @@ -1834,8 +1837,8 @@ sub load_tmp { while (<$spreadsheet_file>) { chomp; my ($cell,$formula) = split(/=/); - $cell = &Apache::lonnet::unescape($cell); - $formula = &Apache::lonnet::unescape($formula); + $cell = &unescape($cell); + $formula = &unescape($formula); $formulas{$cell} = $formula; } $spreadsheet_file->close();