--- rat/lonratsrv.pm	2001/06/25 21:43:49	1.11
+++ rat/lonratsrv.pm	2002/06/27 16:43:57	1.19
@@ -1,6 +1,30 @@
 # The LearningOnline Network with CAPA
 # Server for RAT Maps
 #
+# $Id: lonratsrv.pm,v 1.19 2002/06/27 16:43:57 albertel 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
 #
@@ -8,7 +32,7 @@
 # 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 Gerd Kortemeyer
+# 5/3,06/25,07/03,07/04,07/05 Gerd Kortemeyer
 
 package Apache::lonratsrv;
 
@@ -33,7 +57,7 @@ sub qtescape {
 
 sub qtunescape {
     my $str=shift;
-    $str=~s/\:/\&\#58\;/g;
+    $str=~s/\:/\&colon\;/g;
     $str=~s/\'/\&\#39\;/g;
     $str=~s/\,/\&\#44\;/g;
     $str=~s/\"/\&\#34\;/g;
@@ -84,7 +108,7 @@ sub loadmap {
                     $outstr.='<:>';
                     $outstr.=qtunescape($token->[2]->{'title'}).":";
                     $outstr.=qtunescape($token->[2]->{'src'}).":";
-                    if ($token->[2]->{'src'}=~/\/\//) {
+                    if ($token->[2]->{'external'} eq 'true') {
                         $outstr.='true:';
                     } else {
                         $outstr.='false:';
@@ -147,7 +171,7 @@ sub loadmap {
 # ------------------------------------------------------------------- Parameter
                 } elsif ($token->[1] eq 'param') {
                     $outstr.='<&>objparms<:>'.$token->[2]->{'to'}.'<:>'.
-                             $token->[2]->{'type'}.'___'.$token->[2]->{'name'}                                                   
+                            $token->[2]->{'type'}.'___'.$token->[2]->{'name'}
                                                  .'___'.$token->[2]->{'value'};
                 } elsif ($graphmode) {
 # --------------------------------------------- All other tags (graphical only)
@@ -173,7 +197,9 @@ sub loadmap {
 # ----------------------------------------------------------- Saves map to disk
 
 sub savemap {
-    my ($fn,$errtext)=@_;
+    my ($fn,$errtext,$r)=@_;
+    my %alltypes;
+    my %allvalues;
     if (($fn=~/\.sequence$/) ||
         ($fn=~/\.page$/)) {
 
@@ -199,6 +225,7 @@ sub savemap {
 		       if ($comp[1]!~/^http\:\/\//) {
 			   $comp[1]='http://'.$comp[1];
                        }
+                       $comp[1].='" external="true';
                    } else {
 		       if ($comp[1]=~/^http\:\/\//) {
 			   $comp[1]=~s/^http\:\/\/[^\/]*\//\//;
@@ -233,11 +260,19 @@ sub savemap {
                $outstr.=' index="'.$parts[1].'"';
                $outstr.="></link>\n";
            } elsif ($parts[0] eq 'objparms') {
+               undef %alltypes;
+               undef %allvalues;
                map {
                    my ($type,$name,$value)=split(/\_\_\_/,$_);
-                   $outstr.='<param to="'.$parts[1].'" type="'.$type.'"'
-                          .' name="'.$name.'" value="'.$value.'">'."\n";
+                   $alltypes{$name}=$type;
+                   $allvalues{$name}=$value;
                } split(/:/,$parts[$#parts]);
+               map {
+                   $outstr.='<param to="'.$parts[1].'" type="'
+                          .$alltypes{$_}.'" name="'.$_
+                          .'" value="'.$allvalues{$_}.'">'
+                          ."</param>\n";
+               } keys %allvalues;
            } elsif (($parts[0] ne '') && ($graphdef)) {
 # ------------------------------------------------------------- Graphical input
                $outstr.='<'.$parts[0];
@@ -255,12 +290,12 @@ sub savemap {
              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 {
 # -------------------------------------------- Cannot write to that file, error
-        $errtext.='Map not saved: The specified path does not exist. ';
+        $errtext.='Map not saved: The specified '.$fn.' path does not exist. '.$r->uri();
     }
     return $errtext;
 }
@@ -281,11 +316,18 @@ 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='';
 
   if ($mode ne 'loadonly') {
-     $errtext=&savemap($fn,$errtext);
+     $errtext=&savemap($fn,$errtext,$r);
   }
   ($outtext,$errtext)=&loadmap($fn,$errtext);