--- rat/lonratsrv.pm	2003/02/03 18:03:53	1.24
+++ rat/lonratsrv.pm	2004/02/11 00:10:01	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Server for RAT Maps
 #
-# $Id: lonratsrv.pm,v 1.24 2003/02/03 18:03:53 harris41 Exp $
+# $Id: lonratsrv.pm,v 1.25 2004/02/11 00:10:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,6 +67,7 @@ sub qtunescape {
 
 sub loadmap {
     my ($fn,$errtext)=@_;
+    if ($errtext) { return('',$errtext); }
     my $outstr='';
     my @obj=();
     my @links=();
@@ -81,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;
@@ -293,9 +296,11 @@ sub savemap {
 	if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\//) {
 	    $ENV{'form.output'}=$outstr;
             my $home=&Apache::lonnet::homeserver($2,$1);
-            &Apache::lonnet::finishuserfileupload(
-              $2,$1,$home,
-              'output',(split(/\//,$fn))[-1]);
+            my $result=&Apache::lonnet::finishuserfileupload($2,$1,$home,
+					       'output',(split(/\//,$fn))[-1]);
+	    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")) {