--- loncom/interface/spreadsheet/lonspreadsheet.pm 2003/09/05 01:06:45 1.23 +++ loncom/interface/spreadsheet/lonspreadsheet.pm 2003/09/30 15:40:09 1.26 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.23 2003/09/05 01:06:45 matthew Exp $ +# $Id: lonspreadsheet.pm,v 1.26 2003/09/30 15:40:09 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,6 +62,8 @@ use Apache::assesscalc(); use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::lonhtmlcommon; +use Apache::lonlocal; +use Apache::loncoursedata(); use HTML::Entities(); ## @@ -105,9 +107,8 @@ sub file_dialogs { if ($save_status ne 'ok') { $message .= "An error occurred while saving the spreadsheet". "There error is:".$save_status; - return $result; } else { - $message .= "Spreadsheet saved as ".$ENV{'form.savefilename'}; + $message .= "Spreadsheet saved as ".$spreadsheet->filename(); } } elsif (exists($ENV{'form.newformula'}) && exists($ENV{'form.cell'}) && @@ -209,7 +210,7 @@ sub handler { # HTML Header # if ($r->header_only) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK; } @@ -298,7 +299,7 @@ sub handler { # # Open page, try to prevent browser cache. # - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; @@ -374,6 +375,9 @@ ENDSCRIPT ## ## Take care of "backdoor" spreadsheet expiration / recalc stuff if ($allowed_to_edit && exists($ENV{'form.recalc'})) { + if (exists($ENV{'form.recalc'})) { + &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'}); + } if ($ENV{'form.recalc'} eq 'ilovewastingtime') { &Apache::lonnet::logthis('ilovewastingtime'); # expire ALL spreadsheets @@ -457,7 +461,8 @@ END # $r->print(""); if ($sheettype eq 'classcalc') { - $r->print(''); } if ($allowed_to_view) {
'. + $r->print(''. '