--- rat/lonratsrv.pm	2000/07/04 16:24:17	1.2
+++ rat/lonratsrv.pm	2001/06/26 20:42:17	1.12
@@ -6,7 +6,9 @@
 #
 # 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,7/10,7/26,10/2 Gerd Kortemeyer
+# 4/30/2001 Scott Harrison
+# 5/3,06/25 Gerd Kortemeyer
 
 package Apache::lonratsrv;
 
@@ -16,19 +18,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;
 }
 
@@ -58,31 +66,105 @@ sub loadmap {
                 if ($token->[1] eq 'map') {
 		    $graphmode=($token->[2]->{'mode'} eq 'rat/graphical');
                 } elsif ($token->[1] eq 'resource') {
+# -------------------------------------------------------------------- Resource
+                    $outstr.='<&>objcont';
+                    if ($token->[2]->{'id'}) {
+			$outstr.='<:>'.$token->[2]->{'id'};
+                        if ($obj[$token->[2]->{'id'}]==1) {
+                           $errtext.='Error: multiple use of ID '.
+                                     $token->[2]->{'id'}.'. ';
+                        }
+                        $obj[$token->[2]->{'id'}]=1; 
+                    } else {
+                        my $i=1;
+                        while (($i<=$#obj) && ($obj[$i]!=0)) { $i++; }
+                        $outstr.='<:>'.$i;
+                        $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') {
-                } elsif ($token->[1] eq 'link') {
-                    $outstr.='<&>objlinks';
-                    if ($graphmode) {
-			$outstr.='<:>'.$token->[2]->{'index'};
-                        @links[$token->[2]->{'index'}]=1;
+# ------------------------------------------------------------------- Condition
+                    $outstr.='<&>objcont';
+                    if ($token->[2]->{'id'}) {
+			$outstr.='<:>'.$token->[2]->{'id'};
+                        if ($obj[$token->[2]->{'id'}]==1) {
+                           $errtext.='Error: multiple use of ID '.
+                                     $token->[2]->{'id'}.'. ';
+                        }
+                        $obj[$token->[2]->{'id'}]=1; 
                     } else {
                         my $i=1;
-                        while (($i<=$#links) && ($links[$i]==1)) { $i++; }
+                        while (($i<=$#obj) && ($obj[$i]!=0)) { $i++; }
                         $outstr.='<:>'.$i;
-		    }
+                        $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 ($token->[2]->{'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]->{'from'}.
-                             '<:>'.$token->[2]->{'to'};
+                             ':'.$token->[2]->{'to'};
                     if ($token->[2]->{'condition'}) {
-			$outstr.='<:>'.$token->[2]->{'condition'};
+			$outstr.=':'.$token->[2]->{'condition'};
                     } else {
- 			$outstr.='<:>0';
-                   }
+ 			$outstr.=':0';
+                    }
+# ------------------------------------------------------------------- Parameter
+                } elsif ($token->[1] eq 'param') {
+                    $outstr.='<&>objparms<:>'.$token->[2]->{'to'}.'<:>'.
+                             $token->[2]->{'type'}.'___'.$token->[2]->{'name'}                                                   
+                                                 .'___'.$token->[2]->{'value'};
                 } elsif ($graphmode) {
+# --------------------------------------------- All other tags (graphical only)
+                    $outstr.='<&>'.$token->[1];
+                    if (defined($token->[2]->{'index'})) {
+			$outstr.='<:>'.$token->[2]->{'index'};
+                        if ($token->[1] eq 'obj') {
+			    $obj[$token->[2]->{'index'}]=2;
+                        }
+                    }
+                    $outstr.='<:>'.$token->[2]->{'value'};
                 }
             }
         }
 
     } else {
-        $errtext.='Map not loaded: The file does not exist.';
+        $errtext.='Map not loaded: The file does not exist. ';
     }
     return($outstr,$errtext);
 }
@@ -92,9 +174,9 @@ sub loadmap {
 
 sub savemap {
     my ($fn,$errtext)=@_;
-    if (($fn=~/\.course$/) ||
-        ($fn=~/\.sequence$/) ||
+    if (($fn=~/\.sequence$/) ||
         ($fn=~/\.page$/)) {
+
 # ------------------------------------------------------------- Deal with input
         my @tags=split(/<&>/,$ENV{'form.output'});
         my $outstr='';
@@ -111,8 +193,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];
@@ -123,13 +205,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') {
@@ -150,6 +232,13 @@ sub savemap {
                }
                $outstr.=' index="'.$parts[1].'"';
                $outstr.="></link>\n";
+           } elsif ($parts[0] eq 'objparms') {
+               map {
+                   my ($type,$name,$value)=split(/\_\_\_/,$_);
+                   $outstr.='<param to="'.$parts[1].'" type="'.$type.'"'
+                          .' name="'.$name.'" value="'.$value.'">'
+                          ."</param>\n";
+               } split(/:/,$parts[$#parts]);
            } elsif (($parts[0] ne '') && ($graphdef)) {
 # ------------------------------------------------------------- Graphical input
                $outstr.='<'.$parts[0];
@@ -165,14 +254,14 @@ sub savemap {
           my $fh;
           if ($fh=Apache::File->new(">$fn")) {
              print $fh $outstr;
-             $errtext.="Map saved as $fn.";
+             $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 path does not exist. ';
     }
     return $errtext;
 }
@@ -207,6 +296,9 @@ sub handler {
 <form name=storage method=post action="$url">
 <input type=hidden name=output value="$outtext">
 </form>
+<script>
+    parent.flag=1;
+</script>
 ENDDOCUMENT
     if ($errtext ne '') {
 	$r->print(<<ENDSCRIPT);
@@ -222,10 +314,3 @@ ENDSCRIPT
 
 1;
 __END__
-
-
-
-
-
-
-