--- rat/lonratsrv.pm	2002/08/19 21:15:08	1.21
+++ rat/lonratsrv.pm	2004/03/29 19:44:41	1.26
@@ -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.26 2004/03/29 19:44:41 raeburn 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;
@@ -68,6 +67,7 @@ sub qtunescape {
 
 sub loadmap {
     my ($fn,$errtext)=@_;
+    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;
@@ -205,8 +207,8 @@ sub savemap {
     my ($fn,$errtext)=@_;
     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 +220,7 @@ sub savemap {
         } else {
             $outstr="<map>\n";
         }
-        map {
+        foreach (@tags) {
 	   my @parts=split(/<:>/,$_);
            if ($parts[0] eq 'objcont') {
                my @comp=split(/:/,$parts[$#parts]);
@@ -289,15 +291,16 @@ sub savemap {
                $outstr.=' value="'.qtescape($parts[$#parts]).'"></'.
                         $parts[0].">\n";
            }
-        } @tags;
+        }
         $outstr.="</map>\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")) {