--- rat/lonratsrv.pm 2000/07/28 21:36:12 1.6 +++ rat/lonratsrv.pm 2001/05/03 13:18:49 1.10 @@ -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 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'}) { @@ -167,8 +169,7 @@ sub loadmap { sub savemap { my ($fn,$errtext)=@_; - if (($fn=~/\.course$/) || - ($fn=~/\.sequence$/) || + if (($fn=~/\.sequence$/) || ($fn=~/\.page$/)) { # ------------------------------------------------------------- Deal with input @@ -271,20 +272,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(<