--- rat/lonratsrv.pm 2004/04/23 17:30:33 1.27 +++ rat/lonratsrv.pm 2005/09/26 19:47:52 1.33 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Server for RAT Maps # -# $Id: lonratsrv.pm,v 1.27 2004/04/23 17:30:33 www Exp $ +# $Id: lonratsrv.pm,v 1.33 2005/09/26 19:47:52 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,14 +26,13 @@ # http://www.lon-capa.org/ # - package Apache::lonratsrv; use strict; use Apache::Constants qw(:common); use Apache::File; use HTML::TokeParser; - +use Apache::lonnet; # ------------------------------------------------------------- From RAT to XML @@ -60,7 +59,8 @@ sub qtunescape { # --------------------------------------------------------- Loads map from disk sub loadmap { - my ($fn,$errtext)=@_; + my ($fn,$errtext,$infotext)=@_; + if ($errtext) { return('',$errtext); } my $outstr=''; my @obj=(); my @links=(); @@ -92,7 +92,7 @@ sub loadmap { } elsif ($token->[1] eq 'resource') { # -------------------------------------------------------------------- Resource $outstr.='<&>objcont'; - if ($token->[2]->{'id'}) { + if (defined($token->[2]->{'id'})) { $outstr.='<:>'.$token->[2]->{'id'}; if ($obj[$token->[2]->{'id'}]==1) { $errtext.='Error: multiple use of ID '. @@ -113,16 +113,20 @@ sub loadmap { } else { $outstr.='false:'; } - if ($token->[2]->{'type'}) { + if (defined($token->[2]->{'type'})) { $outstr.=$token->[2]->{'type'}.':'; } else { $outstr.='normal:'; } - $outstr.='res'; + if ($token->[2]->{'type'} ne 'zombie') { + $outstr.='res'; + } else { + $outstr.='zombie'; + } } elsif ($token->[1] eq 'condition') { # ------------------------------------------------------------------- Condition $outstr.='<&>objcont'; - if ($token->[2]->{'id'}) { + if (defined($token->[2]->{'id'})) { $outstr.='<:>'.$token->[2]->{'id'}; if ($obj[$token->[2]->{'id'}]==1) { $errtext.='Error: multiple use of ID '. @@ -137,7 +141,7 @@ sub loadmap { } $outstr.='<:>'; $outstr.=qtunescape($token->[2]->{'value'}).':'; - if ($token->[2]->{'type'}) { + if (defined($token->[2]->{'type'})) { $outstr.=$token->[2]->{'type'}.':'; } else { $outstr.='normal:'; @@ -147,7 +151,7 @@ sub loadmap { # ----------------------------------------------------------------------- Links $outstr.='<&>objlinks'; - if ($token->[2]->{'index'}) { + if (defined($token->[2]->{'index'})) { if ($links[$token->[2]->{'index'}]) { $errtext.='Error: multiple use of link index '. $token->[2]->{'index'}.'. '; @@ -163,7 +167,7 @@ sub loadmap { $outstr.='<:>'.$token->[2]->{'from'}. ':'.$token->[2]->{'to'}; - if ($token->[2]->{'condition'}) { + if (defined($token->[2]->{'condition'})) { $outstr.=':'.$token->[2]->{'condition'}; } else { $outstr.=':0'; @@ -190,7 +194,7 @@ sub loadmap { } else { $errtext.='Map not loaded: The file does not exist. '; } - return($outstr,$errtext); + return($outstr,$errtext,$infotext); } @@ -198,13 +202,14 @@ sub loadmap { sub savemap { my ($fn,$errtext)=@_; + my $infotext=''; my %alltypes; my %allvalues; if (($fn=~/\.sequence(\.tmp)*$/) || ($fn=~/\.page(\.tmp)*$/)) { # ------------------------------------------------------------- Deal with input - my @tags=split(/<&>/,$ENV{'form.output'}); + my @tags=split(/<&>/,$env{'form.output'}); my $outstr=''; my $graphdef=0; if ($tags[0] eq 'graphdef<:>yes') { @@ -218,7 +223,7 @@ sub savemap { if ($parts[0] eq 'objcont') { my @comp=split(/:/,$parts[$#parts]); # --------------------------------------------------------------- Logical input - if ($comp[$#comp] eq 'res') { + if (($comp[$#comp] eq 'res') || ($comp[$#comp] eq 'zombie')) { $comp[0]=qtescape($comp[0]); $comp[1]=qtescape($comp[1]); if ($comp[2] eq 'true') { @@ -240,14 +245,14 @@ sub savemap { if ($comp[0] ne '') { $outstr.=' title="'.$comp[0].'"'; } - $outstr.=">\n"; + $outstr.=" />\n"; } elsif ($comp[$#comp] eq 'cond') { $outstr.='' - ."\n"; + .'" value="'.$allvalues{$_}.'" />' + ."\n"; } } } elsif (($parts[0] ne '') && ($graphdef)) { @@ -281,16 +286,14 @@ sub savemap { if ($#parts==2) { $outstr.=' index="'.$parts[1].'"'; } - $outstr.=' value="'.qtescape($parts[$#parts]).'">\n"; + $outstr.=' value="'.qtescape($parts[$#parts]).'" />'."\n"; } } $outstr.="\n"; if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\/(.*)$/) { - $ENV{'form.output'}=$outstr; - my $home=&Apache::lonnet::homeserver($2,$1); - my $result=&Apache::lonnet::finishuserfileupload($2,$1,$home, - 'output',$3); + $env{'form.output'}=$outstr; + my $result=&Apache::lonnet::finishuserfileupload($2,$1, + 'output',$3); if ($result != m|^/uploaded/|) { $errtext.='Map not saved: A network error occured when trying to save the map. '; } @@ -298,7 +301,7 @@ sub savemap { my $fh; if ($fh=Apache::File->new(">$fn")) { print $fh $outstr; - $errtext.="Map saved as $fn. "; + $infotext.="Map saved as $fn. "; } else { $errtext.='Could not write file '.$fn.'. Map not saved. '; } @@ -307,14 +310,14 @@ sub savemap { # -------------------------------------------- Cannot write to that file, error $errtext.='Map not saved: The specified path does not exist. '; } - return $errtext; + return ($errtext,$infotext); } # ================================================================ Main Handler sub handler { my $r=shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -334,12 +337,13 @@ sub handler { $fn=~s|/[^/]*/ratserver$||; } my $errtext=''; + my $infotext=''; my $outtext=''; if ($mode ne 'loadonly') { - $errtext=&savemap($fn,$errtext); + ($errtext,$infotext)=&savemap($fn,$errtext); } - ($outtext,$errtext)=&loadmap($fn,$errtext); + ($outtext,$errtext,$infotext)=&loadmap($fn,$errtext,$infotext); $r->print(< @@ -351,10 +355,10 @@ sub handler { parent.flag=1; ENDDOCUMENT - if ($errtext ne '') { + if (($errtext ne '') || ($infotext ne '')) { $r->print(< - alert("$errtext"); + alert("$infotext $errtext"); ENDSCRIPT }