--- rat/lonratsrv.pm 2000/07/28 21:36:12 1.6
+++ rat/lonratsrv.pm 2001/06/25 21:43:49 1.11
@@ -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 Gerd Kortemeyer
package Apache::lonratsrv;
@@ -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,7 @@ sub loadmap {
sub savemap {
my ($fn,$errtext)=@_;
- if (($fn=~/\.course$/) ||
- ($fn=~/\.sequence$/) ||
+ if (($fn=~/\.sequence$/) ||
($fn=~/\.page$/)) {
# ------------------------------------------------------------- Deal with input
@@ -226,6 +232,12 @@ sub savemap {
}
$outstr.=' index="'.$parts[1].'"';
$outstr.=">\n";
+ } elsif ($parts[0] eq 'objparms') {
+ map {
+ my ($type,$name,$value)=split(/\_\_\_/,$_);
+ $outstr.=''."\n";
+ } split(/:/,$parts[$#parts]);
} elsif (($parts[0] ne '') && ($graphdef)) {
# ------------------------------------------------------------- Graphical input
$outstr.='<'.$parts[0];
@@ -271,20 +283,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(<