--- rat/lonratsrv.pm 2004/03/29 19:44:41 1.26 +++ 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.26 2004/03/29 19:44:41 raeburn Exp $ +# $Id: lonratsrv.pm,v 1.28 2004/04/23 19:59:01 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,7 +66,7 @@ sub qtunescape { # --------------------------------------------------------- Loads map from disk sub loadmap { - my ($fn,$errtext)=@_; + my ($fn,$errtext,$infotext)=@_; if ($errtext) { return('',$errtext); } my $outstr=''; my @obj=(); @@ -197,7 +197,7 @@ sub loadmap { } else { $errtext.='Map not loaded: The file does not exist. '; } - return($outstr,$errtext); + return($outstr,$errtext,$infotext); } @@ -205,6 +205,7 @@ sub loadmap { sub savemap { my ($fn,$errtext)=@_; + my $infotext=''; my %alltypes; my %allvalues; if (($fn=~/\.sequence(\.tmp)*$/) || @@ -305,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. '; } @@ -314,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 @@ -341,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(< @@ -358,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 }