--- rat/lonratsrv.pm	2001/06/26 20:42:17	1.12
+++ rat/lonratsrv.pm	2001/07/05 13:12:42	1.15
@@ -8,7 +8,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 +33,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 +84,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 +147,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)
@@ -174,6 +174,8 @@ sub loadmap {
 
 sub savemap {
     my ($fn,$errtext)=@_;
+    my %alltypes;
+    my %allvalues;
     if (($fn=~/\.sequence$/) ||
         ($fn=~/\.page$/)) {
 
@@ -199,6 +201,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,12 +236,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.'">'
-                          ."</param>\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];