--- rat/lonratsrv.pm 2000/07/28 21:36:12 1.6 +++ rat/lonratsrv.pm 2005/04/07 06:56:27 1.30 @@ -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.30 2005/04/07 06:56:27 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,7/7,7/8,7/10,7/26 Gerd Kortemeyer package Apache::lonratsrv; @@ -14,7 +32,7 @@ use strict; use Apache::Constants qw(:common); use Apache::File; use HTML::TokeParser; - +use Apache::lonnet; # ------------------------------------------------------------- From RAT to XML @@ -31,7 +49,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; @@ -41,17 +59,25 @@ sub qtunescape { # --------------------------------------------------------- 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; @@ -82,7 +108,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:'; @@ -120,7 +146,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 +160,7 @@ sub loadmap { $outstr.='<:>'.$i; $links[$i]=1; } - } + $outstr.='<:>'.$token->[2]->{'from'}. ':'.$token->[2]->{'to'}; if ($token->[2]->{'condition'}) { @@ -142,6 +168,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]; @@ -159,7 +190,7 @@ sub loadmap { } else { $errtext.='Map not loaded: The file does not exist. '; } - return($outstr,$errtext); + return($outstr,$errtext,$infotext); } @@ -167,12 +198,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') { @@ -181,7 +214,7 @@ sub savemap { } else { $outstr="\n"; } - map { + foreach (@tags) { my @parts=split(/<:>/,$_); if ($parts[0] eq 'objcont') { my @comp=split(/:/,$parts[$#parts]); @@ -193,6 +226,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\:\/\/[^\/]*\//\//; @@ -226,6 +260,22 @@ sub savemap { } $outstr.=' index="'.$parts[1].'"'; $outstr.=">\n"; + } elsif ($parts[0] eq 'objparms') { + undef %alltypes; + undef %allvalues; + foreach (split(/:/,$parts[$#parts])) { + my ($type,$name,$value)=split(/\_\_\_/,$_); + $alltypes{$name}=$type; + $allvalues{$name}=$value; + } + foreach (keys %allvalues) { + if ($allvalues{$_} ne '') { + $outstr.='' + ."\n"; + } + } } elsif (($parts[0] ne '') && ($graphdef)) { # ------------------------------------------------------------- Graphical input $outstr.='<'.$parts[0]; @@ -235,29 +285,37 @@ sub savemap { $outstr.=' value="'.qtescape($parts[$#parts]).'">\n"; } - } @tags; + } $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); + 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. '; } - 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; @@ -269,27 +327,36 @@ 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=''; - my $onload=''; if ($mode ne 'loadonly') { - $errtext=&savemap($fn,$errtext); - $onload='onLoad="parent.code.srvloaded();"'; + ($errtext,$infotext)=&savemap($fn,$errtext); } - ($outtext,$errtext)=&loadmap($fn,$errtext); + ($outtext,$errtext,$infotext)=&loadmap($fn,$errtext,$infotext); $r->print(< - +
+ ENDDOCUMENT - if ($errtext ne '') { + if (($errtext ne '') || ($infotext ne '')) { $r->print(< - alert("$errtext"); + alert("$infotext $errtext"); ENDSCRIPT } @@ -300,10 +367,3 @@ ENDSCRIPT 1; __END__ - - - - - - -