--- rat/lonratsrv.pm	2004/04/23 17:30:33	1.27
+++ rat/lonratsrv.pm	2005/06/08 15:18:28	1.31
@@ -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.31 2005/06/08 15:18:28 www 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=();
@@ -118,7 +118,11 @@ sub loadmap {
                     }  else {
                         $outstr.='normal:';
                     }
-                    $outstr.='res';
+		    if ($token->[2]->{'type'} ne 'zombie') {
+			$outstr.='res';
+		    } else {
+                        $outstr.='zombie';
+		    }
                 } elsif ($token->[1] eq 'condition') {
 # ------------------------------------------------------------------- Condition
                     $outstr.='<&>objcont';
@@ -190,7 +194,7 @@ sub loadmap {
     } else {
         $errtext.='Map not loaded: The file does not exist. ';
     }
-    return($outstr,$errtext);
+    return($outstr,$errtext,$infotext);
 }
 
 
@@ -198,13 +202,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') {
@@ -218,7 +223,7 @@ sub savemap {
            if ($parts[0] eq 'objcont') {
                my @comp=split(/:/,$parts[$#parts]);
 # --------------------------------------------------------------- Logical input
-	       if ($comp[$#comp] eq 'res') {
+	       if (($comp[$#comp] eq 'res') || ($comp[$#comp] eq 'zombie')) {
                    $comp[0]=qtescape($comp[0]);
                    $comp[1]=qtescape($comp[1]);
                    if ($comp[2] eq 'true') {
@@ -240,14 +245,14 @@ sub savemap {
                    if ($comp[0] ne '') {
 		       $outstr.=' title="'.$comp[0].'"';
                    }
-                   $outstr.="></resource>\n";
+                   $outstr.=" />\n";
                } elsif ($comp[$#comp] eq 'cond') {
                    $outstr.='<condition id="'.$parts[1].'"';
                    if (($comp[1] ne '') && ($comp[1] ne 'normal')) {
 		       $outstr.=' type="'.$comp[1].'"';
                    }
                    $outstr.=' value="'.qtescape($comp[0]).'"';
-                   $outstr.="></condition>\n";
+                   $outstr.=" />\n";
                }
            } elsif ($parts[0] eq 'objlinks') {
                my @comp=split(/:/,$parts[$#parts]);
@@ -258,7 +263,7 @@ sub savemap {
                   $outstr.=' condition="'.$comp[2].'"';
                }
                $outstr.=' index="'.$parts[1].'"';
-               $outstr.="></link>\n";
+               $outstr.=" />\n";
            } elsif ($parts[0] eq 'objparms') {
                undef %alltypes;
                undef %allvalues;
@@ -271,8 +276,8 @@ sub savemap {
                   if ($allvalues{$_} ne '') {
                    $outstr.='<param to="'.$parts[1].'" type="'
                           .$alltypes{$_}.'" name="'.$_
-                          .'" value="'.$allvalues{$_}.'">'
-                          ."</param>\n";
+                          .'" value="'.$allvalues{$_}.'" />'
+                          ."\n";
 	          }
                }
            } elsif (($parts[0] ne '') && ($graphdef)) {
@@ -281,13 +286,12 @@ sub savemap {
                if ($#parts==2) {
 		   $outstr.=' index="'.$parts[1].'"';
                }
-               $outstr.=' value="'.qtescape($parts[$#parts]).'"></'.
-                        $parts[0].">\n";
+               $outstr.=' value="'.qtescape($parts[$#parts]).'" />'."\n";
            }
         }
         $outstr.="</map>\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 +302,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 +311,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 +338,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(<<ENDDOCUMENT);
 <html>
@@ -351,10 +356,10 @@ sub handler {
     parent.flag=1;
 </script>
 ENDDOCUMENT
-    if ($errtext ne '') {
+    if (($errtext ne '') || ($infotext ne '')) {
 	$r->print(<<ENDSCRIPT);
 <script>
-    alert("$errtext");
+    alert("$infotext $errtext");
 </script>
 ENDSCRIPT
     }