--- rat/lonratsrv.pm 2004/02/11 00:10:01 1.25 +++ rat/lonratsrv.pm 2005/02/17 09:09:57 1.29 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Server for RAT Maps # -# $Id: lonratsrv.pm,v 1.25 2004/02/11 00:10:01 albertel Exp $ +# $Id: lonratsrv.pm,v 1.29 2005/02/17 09:09:57 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,13 +25,6 @@ # # 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; @@ -66,7 +59,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 +190,7 @@ sub loadmap { } else { $errtext.='Map not loaded: The file does not exist. '; } - return($outstr,$errtext); + return($outstr,$errtext,$infotext); } @@ -205,6 +198,7 @@ sub loadmap { sub savemap { my ($fn,$errtext)=@_; + my $infotext=''; my %alltypes; my %allvalues; if (($fn=~/\.sequence(\.tmp)*$/) || @@ -293,11 +287,11 @@ sub savemap { } } $outstr.="\n"; - if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\//) { + if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\/(.*)$/) { $ENV{'form.output'}=$outstr; my $home=&Apache::lonnet::homeserver($2,$1); my $result=&Apache::lonnet::finishuserfileupload($2,$1,$home, - 'output',(split(/\//,$fn))[-1]); + 'output',$3); if ($result != m|^/uploaded/|) { $errtext.='Map not saved: A network error occured when trying to save the map. '; } @@ -305,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. '; } @@ -314,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; @@ -341,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(< @@ -358,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 }