--- rat/lonratsrv.pm 2002/08/19 21:15:08 1.21
+++ 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.21 2002/08/19 21:15:08 www Exp $
+# $Id: lonratsrv.pm,v 1.28 2004/04/23 19:59:01 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,7 +31,6 @@
# 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
-# 4/30/2001 Scott Harrison
# 5/3,06/25,07/03,07/04,07/05 Gerd Kortemeyer
package Apache::lonratsrv;
@@ -67,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=();
@@ -82,7 +82,9 @@ sub loadmap {
}
$instr=join('',@content);
}
- if ($instr) {
+ if ($instr eq -2) {
+ $errtext.='Map not loaded: An error occured while trying to load the map.';
+ } elsif ($instr) {
my $parser = HTML::TokeParser->new(\$instr);
my $token;
my $graphmode=0;
@@ -195,7 +197,7 @@ sub loadmap {
} else {
$errtext.='Map not loaded: The file does not exist. ';
}
- return($outstr,$errtext);
+ return($outstr,$errtext,$infotext);
}
@@ -203,10 +205,11 @@ sub loadmap {
sub savemap {
my ($fn,$errtext)=@_;
+ my $infotext='';
my %alltypes;
my %allvalues;
- if (($fn=~/\.sequence$/) ||
- ($fn=~/\.page$/)) {
+ if (($fn=~/\.sequence(\.tmp)*$/) ||
+ ($fn=~/\.page(\.tmp)*$/)) {
# ------------------------------------------------------------- Deal with input
my @tags=split(/<&>/,$ENV{'form.output'});
@@ -218,7 +221,7 @@ sub savemap {
} else {
$outstr="\n";
- if ($fn=~/^\/*uploaded\//) {
+ if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\/(.*)$/) {
$ENV{'form.output'}=$outstr;
- &Apache::lonnet::finishuserfileupload(
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.home'},
- 'output',(split(/\//,$fn))[-1]);
+ my $home=&Apache::lonnet::homeserver($2,$1);
+ my $result=&Apache::lonnet::finishuserfileupload($2,$1,$home,
+ 'output',$3);
+ if ($result != m|^/uploaded/|) {
+ $errtext.='Map not saved: A network error occured when trying to save the map. ';
+ }
} else {
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. ';
}
@@ -311,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
@@ -338,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(<
@@ -355,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
}