--- rat/lonratsrv.pm 2000/07/28 21:36:12 1.6
+++ rat/lonratsrv.pm 2002/08/19 21:15:08 1.21
@@ -1,12 +1,38 @@
# The LearningOnline Network with CAPA
# Server for RAT Maps
#
+# $Id: lonratsrv.pm,v 1.21 2002/08/19 21:15:08 www 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/
+#
# (Edit Handler for RAT Maps
# (TeX Content Handler
#
# 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,07/03,07/04,07/05 Gerd Kortemeyer
package Apache::lonratsrv;
@@ -31,7 +57,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;
@@ -43,15 +69,20 @@ sub qtunescape {
sub loadmap {
my ($fn,$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) {
my $parser = HTML::TokeParser->new(\$instr);
my $token;
my $graphmode=0;
@@ -82,7 +113,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 +151,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 +165,7 @@ sub loadmap {
$outstr.='<:>'.$i;
$links[$i]=1;
}
- }
+
$outstr.='<:>'.$token->[2]->{'from'}.
':'.$token->[2]->{'to'};
if ($token->[2]->{'condition'}) {
@@ -142,6 +173,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 +203,9 @@ sub loadmap {
sub savemap {
my ($fn,$errtext)=@_;
- if (($fn=~/\.course$/) ||
- ($fn=~/\.sequence$/) ||
+ my %alltypes;
+ my %allvalues;
+ if (($fn=~/\.sequence$/) ||
($fn=~/\.page$/)) {
# ------------------------------------------------------------- Deal with input
@@ -193,6 +230,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 +264,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];
@@ -237,13 +291,20 @@ sub savemap {
}
} @tags;
$outstr.="\n";
- {
+ if ($fn=~/^\/*uploaded\//) {
+ $ENV{'form.output'}=$outstr;
+ &Apache::lonnet::finishuserfileupload(
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.home'},
+ 'output',(split(/\//,$fn))[-1]);
+ } else {
my $fh;
if ($fh=Apache::File->new(">$fn")) {
print $fh $outstr;
$errtext.="Map saved as $fn. ";
} else {
- $errtext.='Could not write file $fn. Map not saved. ';
+ $errtext.='Could not write file '.$fn.'. Map not saved. ';
}
}
} else {
@@ -269,22 +330,30 @@ 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 $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(<