--- rat/lonratsrv.pm	2000/07/28 21:36:12	1.6
+++ rat/lonratsrv.pm	2001/07/04 19:59:24	1.14
@@ -6,7 +6,9 @@
 #
 # 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 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
 
 package Apache::lonratsrv;
 
@@ -23,7 +25,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;
 }
 
@@ -31,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;
@@ -82,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:';
@@ -120,7 +122,7 @@ sub loadmap {
                 } elsif ($token->[1] eq 'link') {
 # ----------------------------------------------------------------------- Links
                     $outstr.='<&>objlinks';
-                    if ($graphmode) {
+
                         if ($token->[2]->{'index'}) {
 			   if ($links[$token->[2]->{'index'}]) {
                                $errtext.='Error: multiple use of link index '.
@@ -134,7 +136,7 @@ sub loadmap {
                            $outstr.='<:>'.$i;
                            $links[$i]=1;
 		       }
-		    }
+		    
                     $outstr.='<:>'.$token->[2]->{'from'}.
                              ':'.$token->[2]->{'to'};
                     if ($token->[2]->{'condition'}) {
@@ -142,6 +144,11 @@ sub loadmap {
                     } else {
  			$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];
@@ -167,8 +174,9 @@ sub loadmap {
 
 sub savemap {
     my ($fn,$errtext)=@_;
-    if (($fn=~/\.course$/) ||
-        ($fn=~/\.sequence$/) ||
+    my %alltypes;
+    my %allvalues;
+    if (($fn=~/\.sequence$/) ||
         ($fn=~/\.page$/)) {
 
 # ------------------------------------------------------------- Deal with input
@@ -193,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\:\/\/[^\/]*\//\//;
@@ -226,6 +235,20 @@ sub savemap {
                }
                $outstr.=' index="'.$parts[1].'"';
                $outstr.="></link>\n";
+           } elsif ($parts[0] eq 'objparms') {
+               undef %alltypes;
+               undef %allvalues;
+               map {
+                   my ($type,$name,$value)=split(/\_\_\_/,$_);
+                   $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];
@@ -271,20 +294,21 @@ sub handler {
   my $fn=$r->filename;
   my $errtext='';
   my $outtext='';
-  my $onload='';
 
   if ($mode ne 'loadonly') {
      $errtext=&savemap($fn,$errtext);
-     $onload='onLoad="parent.code.srvloaded();"';
   }
   ($outtext,$errtext)=&loadmap($fn,$errtext);
 
   $r->print(<<ENDDOCUMENT);
 <html>
-<body bgcolor="#FFFFFF" $onload>
+<body bgcolor="#FFFFFF">
 <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);
@@ -300,10 +324,3 @@ ENDSCRIPT
 
 1;
 __END__
-
-
-
-
-
-
-