--- rat/lonratsrv.pm	2000/07/28 21:36:12	1.6
+++ rat/lonratsrv.pm	2002/06/24 14:05:51	1.18
@@ -1,12 +1,38 @@
 # The LearningOnline Network with CAPA
 # Server for RAT Maps
 #
+# $Id: lonratsrv.pm,v 1.18 2002/06/24 14:05:51 www 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
 #
 # 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,07/05 Gerd Kortemeyer
 
 package Apache::lonratsrv;
 
@@ -31,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;
@@ -82,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:';
@@ -120,7 +146,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 +160,7 @@ sub loadmap {
                            $outstr.='<:>'.$i;
                            $links[$i]=1;
 		       }
-		    }
+		    
                     $outstr.='<:>'.$token->[2]->{'from'}.
                              ':'.$token->[2]->{'to'};
                     if ($token->[2]->{'condition'}) {
@@ -142,6 +168,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 +198,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 +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\:\/\/[^\/]*\//\//;
@@ -226,6 +259,22 @@ sub savemap {
                }
                $outstr.=' index="'.$parts[1].'"';
                $outstr.="></link>\n";
+           } elsif ($parts[0] eq 'objparms') {
+               undef %alltypes;
+               undef %allvalues;
+               foreach (split(/:/,$parts[$#parts])) {
+                   my ($type,$name,$value)=split(/\_\_\_/,$_);
+                   $alltypes{$name}=$type;
+                   $allvalues{$name}=$value;
+               }
+               foreach (keys %allvalues) {
+                  if ($allvalues{$_} ne '') {
+                   $outstr.='<param to="'.$parts[1].'" type="'
+                          .$alltypes{$_}.'" name="'.$_
+                          .'" value="'.$allvalues{$_}.'">'
+                          ."</param>\n";
+	          }
+               }
            } elsif (($parts[0] ne '') && ($graphdef)) {
 # ------------------------------------------------------------- Graphical input
                $outstr.='<'.$parts[0];
@@ -243,7 +292,7 @@ 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 {
@@ -271,20 +320,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 +350,3 @@ ENDSCRIPT
 
 1;
 __END__
-
-
-
-
-
-
-