--- rat/lonratsrv.pm 2004/04/23 17:30:33 1.27 +++ rat/lonratsrv.pm 2005/04/07 06:56:27 1.30 @@ -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.30 2005/04/07 06:56:27 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,14 +26,13 @@ # http://www.lon-capa.org/ # - package Apache::lonratsrv; use strict; use Apache::Constants qw(:common); use Apache::File; use HTML::TokeParser; - +use Apache::lonnet; # ------------------------------------------------------------- From RAT to XML @@ -60,7 +59,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 +190,7 @@ sub loadmap { } else { $errtext.='Map not loaded: The file does not exist. '; } - return($outstr,$errtext); + return($outstr,$errtext,$infotext); } @@ -198,13 +198,14 @@ sub loadmap { sub savemap { my ($fn,$errtext)=@_; + my $infotext=''; my %alltypes; my %allvalues; if (($fn=~/\.sequence(\.tmp)*$/) || ($fn=~/\.page(\.tmp)*$/)) { # ------------------------------------------------------------- Deal with input - my @tags=split(/<&>/,$ENV{'form.output'}); + my @tags=split(/<&>/,$env{'form.output'}); my $outstr=''; my $graphdef=0; if ($tags[0] eq 'graphdef<:>yes') { @@ -287,7 +288,7 @@ sub savemap { } $outstr.="\n"; if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\/(.*)$/) { - $ENV{'form.output'}=$outstr; + $env{'form.output'}=$outstr; my $home=&Apache::lonnet::homeserver($2,$1); my $result=&Apache::lonnet::finishuserfileupload($2,$1,$home, 'output',$3); @@ -298,7 +299,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,14 +308,14 @@ 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 sub handler { my $r=shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -334,12 +335,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 +353,10 @@ sub handler { parent.flag=1; ENDDOCUMENT - if ($errtext ne '') { + if (($errtext ne '') || ($infotext ne '')) { $r->print(< - alert("$errtext"); + alert("$infotext $errtext"); ENDSCRIPT }