--- rat/lonratsrv.pm	2001/07/04 19:59:24	1.14
+++ rat/lonratsrv.pm	2003/02/03 18:03:53	1.24
@@ -1,14 +1,37 @@
 # The LearningOnline Network with CAPA
 # Server for RAT Maps
 #
+# $Id: lonratsrv.pm,v 1.24 2003/02/03 18:03:53 harris41 Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# 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 Gerd Kortemeyer
+# 5/3,06/25,07/03,07/04,07/05 Gerd Kortemeyer
 
 package Apache::lonratsrv;
 
@@ -25,7 +48,7 @@ sub qtescape {
     $str=~s/\&\#58\;/\:/g;
     $str=~s/\&\#39\;/\'/g;
     $str=~s/\&\#44\;/\,/g;
-    $str=~s/\&\#34\;/\"/g;
+    $str=~s/\"/\&\#34\;/g;
     return $str;
 }
 
@@ -45,15 +68,20 @@ sub qtunescape {
 sub loadmap {
     my ($fn,$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) {
         my $parser = HTML::TokeParser->new(\$instr);
         my $token;
         my $graphmode=0;
@@ -176,8 +204,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'});
@@ -189,7 +217,7 @@ sub savemap {
         } else {
             $outstr="<map>\n";
         }
-        map {
+        foreach (@tags) {
 	   my @parts=split(/<:>/,$_);
            if ($parts[0] eq 'objcont') {
                my @comp=split(/:/,$parts[$#parts]);
@@ -238,17 +266,19 @@ sub savemap {
            } 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;
+	          }
+               }
            } elsif (($parts[0] ne '') && ($graphdef)) {
 # ------------------------------------------------------------- Graphical input
                $outstr.='<'.$parts[0];
@@ -258,15 +288,21 @@ sub savemap {
                $outstr.=' value="'.qtescape($parts[$#parts]).'"></'.
                         $parts[0].">\n";
            }
-        } @tags;
+        }
         $outstr.="</map>\n";
-        {
+	if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\//) {
+	    $ENV{'form.output'}=$outstr;
+            my $home=&Apache::lonnet::homeserver($2,$1);
+            &Apache::lonnet::finishuserfileupload(
+              $2,$1,$home,
+              'output',(split(/\//,$fn))[-1]);
+        } else {
           my $fh;
           if ($fh=Apache::File->new(">$fn")) {
              print $fh $outstr;
              $errtext.="Map saved as $fn. ";
 	  } else {
-             $errtext.='Could not write file $fn. Map not saved. ';
+             $errtext.='Could not write file '.$fn.'.  Map not saved. ';
 	  }
         }
     } else {
@@ -292,6 +328,13 @@ 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 $outtext='';