--- rat/lonratsrv.pm	2002/04/03 15:30:13	1.17
+++ 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.17 2002/04/03 15:30:13 matthew Exp $
+# $Id: lonratsrv.pm,v 1.32 2005/06/13 20:23:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,14 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# (Edit Handler for RAT Maps
-# (TeX Content Handler
-#
-# 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;
 
@@ -40,7 +32,7 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::File;
 use HTML::TokeParser;
-
+use Apache::lonnet;
 
 # ------------------------------------------------------------- From RAT to XML
 
@@ -67,17 +59,25 @@ sub qtunescape {
 # --------------------------------------------------------- Loads map from disk
 
 sub loadmap {
-    my ($fn,$errtext)=@_;
+    my ($fn,$errtext,$infotext)=@_;
+    if ($errtext) { return('',$errtext); }
     my $outstr='';
-    my @content=();
     my @obj=();
     my @links=();
-    if (-e $fn) {
+    my $instr='';
+    if ($fn=~/^\/*uploaded\//) {
+        $instr=&Apache::lonnet::getfile($fn);
+    } elsif (-e $fn) {
+        my @content=();
         {
 	    my $fh=Apache::File->new($fn);
             @content=<$fh>;
         }
-        my $instr=join('',@content);
+        $instr=join('',@content);
+    }
+    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;
@@ -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$/) ||
-        ($fn=~/\.page$/)) {
+    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') {
@@ -213,12 +218,12 @@ sub savemap {
         } else {
             $outstr="<map>\n";
         }
-        map {
+        foreach (@tags) {
 	   my @parts=split(/<:>/,$_);
            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,37 +263,45 @@ sub savemap {
                   $outstr.=' condition="'.$comp[2].'"';
                }
                $outstr.=' index="'.$parts[1].'"';
-               $outstr.="></link>\n";
+               $outstr.=" />\n";
            } elsif ($parts[0] eq 'objparms') {
                undef %alltypes;
                undef %allvalues;
-               map {
+               foreach (split(/:/,$parts[$#parts])) {
                    my ($type,$name,$value)=split(/\_\_\_/,$_);
                    $alltypes{$name}=$type;
                    $allvalues{$name}=$value;
-               } split(/:/,$parts[$#parts]);
-               map {
+               }
+               foreach (keys %allvalues) {
+                  if ($allvalues{$_} ne '') {
                    $outstr.='<param to="'.$parts[1].'" type="'
                           .$alltypes{$_}.'" name="'.$_
-                          .'" value="'.$allvalues{$_}.'">'
-                          ."</param>\n";
-               } keys %allvalues;
+                          .'" value="'.$allvalues{$_}.'" />'
+                          ."\n";
+	          }
+               }
            } elsif (($parts[0] ne '') && ($graphdef)) {
 # ------------------------------------------------------------- Graphical input
                $outstr.='<'.$parts[0];
                if ($#parts==2) {
 		   $outstr.=' index="'.$parts[1].'"';
                }
-               $outstr.=' value="'.qtescape($parts[$#parts]).'"></'.
-                        $parts[0].">\n";
+               $outstr.=' value="'.qtescape($parts[$#parts]).'" />'."\n";
            }
-        } @tags;
+        }
         $outstr.="</map>\n";
-        {
+	if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\/(.*)$/) {
+	    $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. ';
+	    }
+        } else {
           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. ';
 	  }
@@ -297,14 +310,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;
@@ -316,13 +329,21 @@ sub handler {
   $url=~s/\/loadonly\/ratserver$/\/save\/ratserver/;
   
   my $fn=$r->filename;
+  my $lonDocRoot=$r->dir_config('lonDocRoot');
+  if ( $fn =~ /$lonDocRoot/ ) {
+      #internal authentication, needs fixup.
+      $fn = $url;
+      $fn=~s|^/~(\w+)|/home/$1/public_html|;
+      $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>
@@ -334,10 +355,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
     }