--- rat/lonratsrv.pm	2005/04/07 06:56:27	1.30
+++ rat/lonratsrv.pm	2006/07/21 00:21:42	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Server for RAT Maps
 #
-# $Id: lonratsrv.pm,v 1.30 2005/04/07 06:56:27 albertel Exp $
+# $Id: lonratsrv.pm,v 1.36 2006/07/21 00:21:42 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,11 +33,13 @@ use Apache::Constants qw(:common);
 use Apache::File;
 use HTML::TokeParser;
 use Apache::lonnet;
+use Apache::groupsort();
 
 # ------------------------------------------------------------- From RAT to XML
 
 sub qtescape {
     my $str=shift;
+    $str=~s/\:/\:/g;
     $str=~s/\&\#58\;/\:/g;
     $str=~s/\&\#39\;/\'/g;
     $str=~s/\&\#44\;/\,/g;
@@ -92,7 +94,7 @@ sub loadmap {
                 } elsif ($token->[1] eq 'resource') {
 # -------------------------------------------------------------------- Resource
                     $outstr.='<&>objcont';
-                    if ($token->[2]->{'id'}) {
+                    if (defined($token->[2]->{'id'})) {
 			$outstr.='<:>'.$token->[2]->{'id'};
                         if ($obj[$token->[2]->{'id'}]==1) {
                            $errtext.='Error: multiple use of ID '.
@@ -113,16 +115,20 @@ sub loadmap {
                     } else {
                         $outstr.='false:';
                     }
-                    if ($token->[2]->{'type'}) {
+                    if (defined($token->[2]->{'type'})) {
 			$outstr.=$token->[2]->{'type'}.':';
                     }  else {
                         $outstr.='normal:';
                     }
-                    $outstr.='res';
+		    if ($token->[2]->{'type'} ne 'zombie') {
+			$outstr.='res';
+		    } else {
+                        $outstr.='zombie';
+		    }
                 } elsif ($token->[1] eq 'condition') {
 # ------------------------------------------------------------------- Condition
                     $outstr.='<&>objcont';
-                    if ($token->[2]->{'id'}) {
+                    if (defined($token->[2]->{'id'})) {
 			$outstr.='<:>'.$token->[2]->{'id'};
                         if ($obj[$token->[2]->{'id'}]==1) {
                            $errtext.='Error: multiple use of ID '.
@@ -137,7 +143,7 @@ sub loadmap {
                     }
                     $outstr.='<:>';
                     $outstr.=qtunescape($token->[2]->{'value'}).':';
-                    if ($token->[2]->{'type'}) {
+                    if (defined($token->[2]->{'type'})) {
 			$outstr.=$token->[2]->{'type'}.':';
                     } else {
                         $outstr.='normal:';
@@ -147,7 +153,7 @@ sub loadmap {
 # ----------------------------------------------------------------------- Links
                     $outstr.='<&>objlinks';
 
-                        if ($token->[2]->{'index'}) {
+                        if (defined($token->[2]->{'index'})) {
 			   if ($links[$token->[2]->{'index'}]) {
                                $errtext.='Error: multiple use of link index '.
 			       $token->[2]->{'index'}.'. ';
@@ -163,7 +169,7 @@ sub loadmap {
 		    
                     $outstr.='<:>'.$token->[2]->{'from'}.
                              ':'.$token->[2]->{'to'};
-                    if ($token->[2]->{'condition'}) {
+                    if (defined($token->[2]->{'condition'})) {
 			$outstr.=':'.$token->[2]->{'condition'};
                     } else {
  			$outstr.=':0';
@@ -219,7 +225,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 +247,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 +265,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 +278,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 +288,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);
+            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. ';
 	    }
@@ -308,6 +312,7 @@ sub savemap {
 # -------------------------------------------- Cannot write to that file, error
         $errtext.='Map not saved: The specified path does not exist. ';
     }
+    &Apache::groupsort::clear_basket();
     return ($errtext,$infotext);
 }
 
@@ -343,24 +348,30 @@ sub handler {
   }
   ($outtext,$errtext,$infotext)=&loadmap($fn,$errtext,$infotext);
 
+  my $start_page =
+      &Apache::loncommon::start_page('Alert',undef,
+				     {'only_body' => 1,
+				      'bgcolor'   => '#FFFFFF',});
+  my $end_page =
+      &Apache::loncommon::end_page();
+
   $r->print(<<ENDDOCUMENT);
-<html>
-<body bgcolor="#FFFFFF">
-<form name=storage method=post action="$url">
-<input type=hidden name=output value="$outtext">
+$start_page
+<form name="storage" method="post" action="$url">
+<input type="hidden" name="output" value="$outtext" />
 </form>
-<script>
+<script type ="text/javascript">
     parent.flag=1;
 </script>
 ENDDOCUMENT
     if (($errtext ne '') || ($infotext ne '')) {
 	$r->print(<<ENDSCRIPT);
-<script>
+<script type="text/javascript">
     alert("$infotext $errtext");
 </script>
 ENDSCRIPT
     }
-    $r->print("</body>\n</html>\n");
+    $r->print($end_page);
 
   return OK;
 }