--- rat/lonratsrv.pm	2005/02/17 09:09:57	1.29
+++ rat/lonratsrv.pm	2005/06/13 20:23:53	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Server for RAT Maps
 #
-# $Id: lonratsrv.pm,v 1.29 2005/02/17 09:09:57 albertel Exp $
+# $Id: lonratsrv.pm,v 1.32 2005/06/13 20:23:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,7 +32,7 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::File;
 use HTML::TokeParser;
-
+use Apache::lonnet;
 
 # ------------------------------------------------------------- From RAT to XML
 
@@ -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';
@@ -205,7 +209,7 @@ sub savemap {
         ($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') {
@@ -219,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') {
@@ -241,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]);
@@ -259,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;
@@ -272,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)) {
@@ -282,16 +286,14 @@ 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;
-            my $home=&Apache::lonnet::homeserver($2,$1);
-            my $result=&Apache::lonnet::finishuserfileupload($2,$1,$home,
-						'output',$3);
+	    $env{'form.output'}=$outstr;
+            my $result=&Apache::lonnet::finishuserfileupload($2,$1,
+							     'output',$3);
 	    if ($result != m|^/uploaded/|) {
 		$errtext.='Map not saved: A network error occured when trying to save the map. ';
 	    }