--- rat/lonratsrv.pm	2000/07/05 21:05:28	1.3
+++ rat/lonratsrv.pm	2000/07/08 11:23:36	1.4
@@ -6,7 +6,7 @@
 #
 # 05/29/00,05/30 Gerd Kortemeyer)
 # 7/1 Gerd Kortemeyer)
-# 7/1,7/3,7/4 Gerd Kortemeyer
+# 7/1,7/3,7/4,7/7,7/8 Gerd Kortemeyer
 
 package Apache::lonratsrv;
 
@@ -16,19 +16,25 @@ use Apache::File;
 use HTML::TokeParser;
 
 
-# ---------------------------------------------------------- Escape Quote Chars
+# ------------------------------------------------------------- From RAT to XML
 
 sub qtescape {
     my $str=shift;
-    $str =~ s/([\"\%])/"%".unpack('H2',$1)/eg;
+    $str=~s/\&\#58\;/\:/g;
+    $str=~s/\&\#39\;/\'/g;
+    $str=~s/\&\#44\;/\,/g;
+    $str=~s/\"/\&\#34\;/g;
     return $str;
 }
 
-# ----------------------------------------------------- Un-Escape Special Chars
+# ------------------------------------------------------------- From XML to RAT
 
-sub unescape {
+sub qtunescape {
     my $str=shift;
-    $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+    $str=~s/\:/\&\#58\;/g;
+    $str=~s/\'/\&\#39\;/g;
+    $str=~s/\,/\&\#44\;/g;
+    $str=~s/\"/\&\#34\;/g;
     return $str;
 }
 
@@ -74,6 +80,19 @@ sub loadmap {
                         $obj[$i]=1;
                     }
                     $outstr.='<:>';
+                    $outstr.=qtunescape($token->[2]->{'title'}).":";
+                    $outstr.=qtunescape($token->[2]->{'src'}).":";
+                    if ($token->[2]->{'src'}=~/\/\//) {
+                        $outstr.='true:';
+                    } else {
+                        $outstr.='false:';
+                    }
+                    if ($token->[2]->{'type'}) {
+			$outstr.=$token->[2]->{'type'}.':';
+                    }  else {
+                        $outstr.='normal:';
+                    }
+                    $outstr.='res';
                 } elsif ($token->[1] eq 'condition') {
 # ------------------------------------------------------------------- Condition
                     $outstr.='<&>objcont';
@@ -91,20 +110,30 @@ sub loadmap {
                         $obj[$i]=1;
                     }
                     $outstr.='<:>';
+                    $outstr.=qtunescape($token->[2]->{'value'}).':';
+                    if ($token->[2]->{'type'}) {
+			$outstr.=$token->[2]->{'type'}.':';
+                    } else {
+                        $outstr.='normal:';
+                    }
+                    $outstr.='cond';
                 } elsif ($token->[1] eq 'link') {
 # ----------------------------------------------------------------------- Links
                     $outstr.='<&>objlinks';
                     if ($graphmode) {
                         if ($token->[2]->{'index'}) {
-                           $errtext.='Error: multiple use of link index '.
+			   if ($links[$token->[2]->{'index'}]) {
+                               $errtext.='Error: multiple use of link index '.
 			       $token->[2]->{'index'}.'. ';
-			$outstr.='<:>'.$token->[2]->{'index'};
-                        $links[$token->[2]->{'index'}]=1;
-                    } else {
-                        my $i=1;
-                        while (($i<=$#links) && ($links[$i]==1)) { $i++; }
-                        $outstr.='<:>'.$i;
-                        $links[$i]=1;
+                           }
+			   $outstr.='<:>'.$token->[2]->{'index'};
+                           $links[$token->[2]->{'index'}]=1;
+                        } else {
+                           my $i=1;
+                           while (($i<=$#links) && ($links[$i]==1)) { $i++; }
+                           $outstr.='<:>'.$i;
+                           $links[$i]=1;
+		       }
 		    }
                     $outstr.='<:>'.$token->[2]->{'from'}.
                              '<:>'.$token->[2]->{'to'};
@@ -112,11 +141,11 @@ sub loadmap {
 			$outstr.='<:>'.$token->[2]->{'condition'};
                     } else {
  			$outstr.='<:>0';
-                   }
+                    }
                 } elsif ($graphmode) {
 # --------------------------------------------- All other tags (graphical only)
                     $outstr.='<&>'.$token->[1];
-                    if ($token->[2]->{'index'}) {
+                    if (defined($token->[2]->{'index'})) {
 			$outstr.='<:>'.$token->[2]->{'index'};
                         if ($token->[1] eq 'obj') {
 			    $obj[$token->[2]->{'index'}]=2;
@@ -141,6 +170,7 @@ sub savemap {
     if (($fn=~/\.course$/) ||
         ($fn=~/\.sequence$/) ||
         ($fn=~/\.page$/)) {
+
 # ------------------------------------------------------------- Deal with input
         my @tags=split(/<&>/,$ENV{'form.output'});
         my $outstr='';
@@ -157,8 +187,8 @@ sub savemap {
                my @comp=split(/:/,$parts[$#parts]);
 # --------------------------------------------------------------- Logical input
 	       if ($comp[$#comp] eq 'res') {
-                   $comp[0]=~s/\&\#(\d+)\;/pack("C",$1)/eg;
-                   $comp[1]=~s/\&\#(\d+)\;/pack("C",$1)/eg;
+                   $comp[0]=qtescape($comp[0]);
+                   $comp[1]=qtescape($comp[1]);
                    if ($comp[2] eq 'true') {
 		       if ($comp[1]!~/^http\:\/\//) {
 			   $comp[1]='http://'.$comp[1];
@@ -169,13 +199,13 @@ sub savemap {
                        }
                    }
 		   $outstr.='<resource id="'.$parts[1].'" src="'
-                          .qtescape($comp[1]).'"';
+                          .$comp[1].'"';
 
                    if (($comp[3] ne '') && ($comp[3] ne 'normal')) {
 		       $outstr.=' type="'.$comp[3].'"';
                    }
                    if ($comp[0] ne '') {
-		       $outstr.=' title="'.qtescape($comp[0]).'"';
+		       $outstr.=' title="'.$comp[0].'"';
                    }
                    $outstr.="></resource>\n";
                } elsif ($comp[$#comp] eq 'cond') {