--- rat/lonratsrv.pm 2000/07/04 16:24:17 1.2 +++ rat/lonratsrv.pm 2006/07/21 08:30:57 1.37 @@ -1,12 +1,30 @@ # The LearningOnline Network with CAPA # Server for RAT Maps # -# (Edit Handler for RAT Maps -# (TeX Content Handler +# $Id: lonratsrv.pm,v 1.37 2006/07/21 08:30:57 albertel 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/ # -# 05/29/00,05/30 Gerd Kortemeyer) -# 7/1 Gerd Kortemeyer) -# 7/1,7/3,7/4 Gerd Kortemeyer package Apache::lonratsrv; @@ -14,38 +32,53 @@ use strict; use Apache::Constants qw(:common); use Apache::File; use HTML::TokeParser; +use Apache::lonnet; - -# ---------------------------------------------------------- Escape Quote Chars +# ------------------------------------------------------------- From RAT to XML sub qtescape { my $str=shift; - $str =~ s/([\"\%])/"%".unpack('H2',$1)/eg; + $str=~s/\:/\:/g; + $str=~s/\&\#58\;/\:/g; + $str=~s/\&\#39\;/\'/g; + $str=~s/\&\#44\;/\,/g; + $str=~s/\"/\&\#34\;/g; return $str; } -# ----------------------------------------------------- Un-Escape Special Chars +# ------------------------------------------------------------- From XML to RAT -sub unescape { +sub qtunescape { my $str=shift; - $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; + $str=~s/\:/\&colon\;/g; + $str=~s/\'/\&\#39\;/g; + $str=~s/\,/\&\#44\;/g; + $str=~s/\"/\&\#34\;/g; return $str; } # --------------------------------------------------------- Loads map from disk sub loadmap { - my ($fn,$errtext)=@_; + my ($fn,$errtext,$infotext)=@_; + if ($errtext) { return('',$errtext); } my $outstr=''; - my @content=(); my @obj=(); my @links=(); - if (-e $fn) { + my $instr=''; + if ($fn=~/^\/*uploaded\//) { + $instr=&Apache::lonnet::getfile($fn); + } elsif (-e $fn) { + my @content=(); { my $fh=Apache::File->new($fn); @content=<$fh>; } - my $instr=join('',@content); + $instr=join('',@content); + } + if ($instr eq -2) { + $errtext.='Map not loaded: An error occured while trying to load the map.'; + } elsif ($instr) { my $parser = HTML::TokeParser->new(\$instr); my $token; my $graphmode=0; @@ -58,33 +91,111 @@ sub loadmap { if ($token->[1] eq 'map') { $graphmode=($token->[2]->{'mode'} eq 'rat/graphical'); } elsif ($token->[1] eq 'resource') { - } elsif ($token->[1] eq 'condition') { - } elsif ($token->[1] eq 'link') { - $outstr.='<&>objlinks'; - if ($graphmode) { - $outstr.='<:>'.$token->[2]->{'index'}; - @links[$token->[2]->{'index'}]=1; +# -------------------------------------------------------------------- Resource + $outstr.='<&>objcont'; + if (defined($token->[2]->{'id'})) { + $outstr.='<:>'.$token->[2]->{'id'}; + if ($obj[$token->[2]->{'id'}]==1) { + $errtext.='Error: multiple use of ID '. + $token->[2]->{'id'}.'. '; + } + $obj[$token->[2]->{'id'}]=1; } else { my $i=1; - while (($i<=$#links) && ($links[$i]==1)) { $i++; } + while (($i<=$#obj) && ($obj[$i]!=0)) { $i++; } $outstr.='<:>'.$i; + $obj[$i]=1; + } + $outstr.='<:>'; + $outstr.=qtunescape($token->[2]->{'title'}).":"; + $outstr.=qtunescape($token->[2]->{'src'}).":"; + if ($token->[2]->{'external'} eq 'true') { + $outstr.='true:'; + } else { + $outstr.='false:'; + } + if (defined($token->[2]->{'type'})) { + $outstr.=$token->[2]->{'type'}.':'; + } else { + $outstr.='normal:'; + } + if ($token->[2]->{'type'} ne 'zombie') { + $outstr.='res'; + } else { + $outstr.='zombie'; } + } elsif ($token->[1] eq 'condition') { +# ------------------------------------------------------------------- Condition + $outstr.='<&>objcont'; + if (defined($token->[2]->{'id'})) { + $outstr.='<:>'.$token->[2]->{'id'}; + if ($obj[$token->[2]->{'id'}]==1) { + $errtext.='Error: multiple use of ID '. + $token->[2]->{'id'}.'. '; + } + $obj[$token->[2]->{'id'}]=1; + } else { + my $i=1; + while (($i<=$#obj) && ($obj[$i]!=0)) { $i++; } + $outstr.='<:>'.$i; + $obj[$i]=1; + } + $outstr.='<:>'; + $outstr.=qtunescape($token->[2]->{'value'}).':'; + if (defined($token->[2]->{'type'})) { + $outstr.=$token->[2]->{'type'}.':'; + } else { + $outstr.='normal:'; + } + $outstr.='cond'; + } elsif ($token->[1] eq 'link') { +# ----------------------------------------------------------------------- Links + $outstr.='<&>objlinks'; + + if (defined($token->[2]->{'index'})) { + if ($links[$token->[2]->{'index'}]) { + $errtext.='Error: multiple use of link index '. + $token->[2]->{'index'}.'. '; + } + $outstr.='<:>'.$token->[2]->{'index'}; + $links[$token->[2]->{'index'}]=1; + } else { + my $i=1; + while (($i<=$#links) && ($links[$i]==1)) { $i++; } + $outstr.='<:>'.$i; + $links[$i]=1; + } + $outstr.='<:>'.$token->[2]->{'from'}. - '<:>'.$token->[2]->{'to'}; - if ($token->[2]->{'condition'}) { - $outstr.='<:>'.$token->[2]->{'condition'}; + ':'.$token->[2]->{'to'}; + if (defined($token->[2]->{'condition'})) { + $outstr.=':'.$token->[2]->{'condition'}; } else { - $outstr.='<:>0'; - } + $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]; + if (defined($token->[2]->{'index'})) { + $outstr.='<:>'.$token->[2]->{'index'}; + if ($token->[1] eq 'obj') { + $obj[$token->[2]->{'index'}]=2; + } + } + $outstr.='<:>'.$token->[2]->{'value'}; } } } } else { - $errtext.='Map not loaded: The file does not exist.'; + $errtext.='Map not loaded: The file does not exist. '; } - return($outstr,$errtext); + return($outstr,$errtext,$infotext); } @@ -92,11 +203,14 @@ sub loadmap { sub savemap { my ($fn,$errtext)=@_; - if (($fn=~/\.course$/) || - ($fn=~/\.sequence$/) || - ($fn=~/\.page$/)) { + 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') { @@ -105,40 +219,41 @@ sub savemap { } else { $outstr="\n"; } - map { + foreach (@tags) { my @parts=split(/<:>/,$_); if ($parts[0] eq 'objcont') { my @comp=split(/:/,$parts[$#parts]); # --------------------------------------------------------------- Logical input - if ($comp[$#comp] eq 'res') { - $comp[0]=~s/\&\#(\d+)\;/pack("C",$1)/eg; - $comp[1]=~s/\&\#(\d+)\;/pack("C",$1)/eg; + if (($comp[$#comp] eq 'res') || ($comp[$#comp] eq 'zombie')) { + $comp[0]=qtescape($comp[0]); + $comp[1]=qtescape($comp[1]); if ($comp[2] eq 'true') { if ($comp[1]!~/^http\:\/\//) { $comp[1]='http://'.$comp[1]; } + $comp[1].='" external="true'; } else { if ($comp[1]=~/^http\:\/\//) { $comp[1]=~s/^http\:\/\/[^\/]*\//\//; } } $outstr.='' + ."\n"; + } + } } elsif (($parts[0] ne '') && ($graphdef)) { # ------------------------------------------------------------- Graphical input $outstr.='<'.$parts[0]; if ($#parts==2) { $outstr.=' index="'.$parts[1].'"'; } - $outstr.=' value="'.qtescape($parts[$#parts]).'">\n"; + $outstr.=' value="'.qtescape($parts[$#parts]).'" />'."\n"; } - } @tags; + } $outstr.="\n"; - { + if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\/(.*)$/) { + $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. '; + } + } else { 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.'; + $errtext.='Could not write file '.$fn.'. Map not saved. '; } } } else { # -------------------------------------------- Cannot write to that file, error - $errtext.='Map not saved: The specified path does not exist.'; + $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; @@ -193,39 +330,49 @@ sub handler { $url=~s/\/loadonly\/ratserver$/\/save\/ratserver/; my $fn=$r->filename; + my $lonDocRoot=$r->dir_config('lonDocRoot'); + if ( $fn =~ /$lonDocRoot/ ) { + #internal authentication, needs fixup. + $fn = $url; + $fn=~s|^/~(\w+)|/home/$1/public_html|; + $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); + + my $start_page = + &Apache::loncommon::start_page('Alert',undef, + {'only_body' => 1, + 'bgcolor' => '#FFFFFF',}); + my $end_page = + &Apache::loncommon::end_page(); $r->print(< - -
- +$start_page + +
+ ENDDOCUMENT - if ($errtext ne '') { + if (($errtext ne '') || ($infotext ne '')) { $r->print(< - alert("$errtext"); + ENDSCRIPT } - $r->print("\n\n"); + $r->print($end_page); return OK; } 1; __END__ - - - - - - -