--- rat/lonratsrv.pm 2004/04/23 17:30:33 1.27 +++ rat/lonratsrv.pm 2004/04/23 19:59:01 1.28 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Server for RAT Maps # -# $Id: lonratsrv.pm,v 1.27 2004/04/23 17:30:33 www Exp $ +# $Id: lonratsrv.pm,v 1.28 2004/04/23 19:59:01 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,7 +25,13 @@ # # http://www.lon-capa.org/ # - +# (Edit Handler for RAT Maps +# (TeX Content Handler +# +# 05/29/00,05/30 Gerd Kortemeyer) +# 7/1 Gerd Kortemeyer) +# 7/1,7/3,7/4,7/7,7/8,7/10,7/26,10/2 Gerd Kortemeyer +# 5/3,06/25,07/03,07/04,07/05 Gerd Kortemeyer package Apache::lonratsrv; @@ -60,7 +66,8 @@ sub qtunescape { # --------------------------------------------------------- Loads map from disk sub loadmap { - my ($fn,$errtext)=@_; + my ($fn,$errtext,$infotext)=@_; + if ($errtext) { return('',$errtext); } my $outstr=''; my @obj=(); my @links=(); @@ -190,7 +197,7 @@ sub loadmap { } else { $errtext.='Map not loaded: The file does not exist. '; } - return($outstr,$errtext); + return($outstr,$errtext,$infotext); } @@ -198,6 +205,7 @@ sub loadmap { sub savemap { my ($fn,$errtext)=@_; + my $infotext=''; my %alltypes; my %allvalues; if (($fn=~/\.sequence(\.tmp)*$/) || @@ -298,7 +306,7 @@ sub savemap { my $fh; if ($fh=Apache::File->new(">$fn")) { print $fh $outstr; - $errtext.="Map saved as $fn. "; + $infotext.="Map saved as $fn. "; } else { $errtext.='Could not write file '.$fn.'. Map not saved. '; } @@ -307,7 +315,7 @@ sub savemap { # -------------------------------------------- Cannot write to that file, error $errtext.='Map not saved: The specified path does not exist. '; } - return $errtext; + return ($errtext,$infotext); } # ================================================================ Main Handler @@ -334,12 +342,13 @@ sub handler { $fn=~s|/[^/]*/ratserver$||; } my $errtext=''; + my $infotext=''; my $outtext=''; if ($mode ne 'loadonly') { - $errtext=&savemap($fn,$errtext); + ($errtext,$infotext)=&savemap($fn,$errtext); } - ($outtext,$errtext)=&loadmap($fn,$errtext); + ($outtext,$errtext,$infotext)=&loadmap($fn,$errtext,$infotext); $r->print(< @@ -351,10 +360,10 @@ sub handler { parent.flag=1; ENDDOCUMENT - if ($errtext ne '') { + if (($errtext ne '') || ($infotext ne '')) { $r->print(< - alert("$errtext"); + alert("$infotext $errtext"); ENDSCRIPT } 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.