--- rat/lonratsrv.pm 2000/10/02 16:10:12 1.7
+++ rat/lonratsrv.pm 2001/07/05 13:12:42 1.15
@@ -7,6 +7,8 @@
# 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,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 +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:';
@@ -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,6 +174,8 @@ sub loadmap {
sub savemap {
my ($fn,$errtext)=@_;
+ my %alltypes;
+ my %allvalues;
if (($fn=~/\.sequence$/) ||
($fn=~/\.page$/)) {
@@ -192,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\:\/\/[^\/]*\//\//;
@@ -225,6 +235,20 @@ sub savemap {
}
$outstr.=' index="'.$parts[1].'"';
$outstr.=">\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.=''
+ ."\n";
+ } keys %allvalues;
} elsif (($parts[0] ne '') && ($graphdef)) {
# ------------------------------------------------------------- Graphical input
$outstr.='<'.$parts[0];
@@ -270,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
if ($errtext ne '') {
$r->print(<