--- rat/lonratsrv.pm 2002/08/19 21:15:08 1.21
+++ rat/lonratsrv.pm 2006/07/21 00:21:42 1.36
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Server for RAT Maps
#
-# $Id: lonratsrv.pm,v 1.21 2002/08/19 21:15:08 www Exp $
+# $Id: lonratsrv.pm,v 1.36 2006/07/21 00:21:42 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,14 +25,6 @@
#
# 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,10/2 Gerd Kortemeyer
-# 4/30/2001 Scott Harrison
-# 5/3,06/25,07/03,07/04,07/05 Gerd Kortemeyer
package Apache::lonratsrv;
@@ -40,12 +32,14 @@ use strict;
use Apache::Constants qw(:common);
use Apache::File;
use HTML::TokeParser;
-
+use Apache::lonnet;
+use Apache::groupsort();
# ------------------------------------------------------------- From RAT to XML
sub qtescape {
my $str=shift;
+ $str=~s/\:/\:/g;
$str=~s/\&\#58\;/\:/g;
$str=~s/\&\#39\;/\'/g;
$str=~s/\&\#44\;/\,/g;
@@ -67,7 +61,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=();
@@ -82,7 +77,9 @@ sub loadmap {
}
$instr=join('',@content);
}
- if ($instr) {
+ 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;
@@ -97,7 +94,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 '.
@@ -118,16 +115,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 '.
@@ -142,7 +143,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:';
@@ -152,7 +153,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'}.'. ';
@@ -168,7 +169,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';
@@ -195,7 +196,7 @@ sub loadmap {
} else {
$errtext.='Map not loaded: The file does not exist. ';
}
- return($outstr,$errtext);
+ return($outstr,$errtext,$infotext);
}
@@ -203,13 +204,14 @@ sub loadmap {
sub savemap {
my ($fn,$errtext)=@_;
+ my $infotext='';
my %alltypes;
my %allvalues;
- if (($fn=~/\.sequence$/) ||
- ($fn=~/\.page$/)) {
+ 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,12 +220,12 @@ sub savemap {
} else {
$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]);
+ 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. ';
}
@@ -311,14 +312,15 @@ sub savemap {
# -------------------------------------------- Cannot write to that file, error
$errtext.='Map not saved: The specified path does not exist. ';
}
- return $errtext;
+ &Apache::groupsort::clear_basket();
+ 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;
@@ -338,31 +340,38 @@ 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);
+
+ my $start_page =
+ &Apache::loncommon::start_page('Alert',undef,
+ {'only_body' => 1,
+ 'bgcolor' => '#FFFFFF',});
+ my $end_page =
+ &Apache::loncommon::end_page();
$r->print(<
-
-
-
ENDDOCUMENT
- if ($errtext ne '') {
+ if (($errtext ne '') || ($infotext ne '')) {
$r->print(<
- alert("$errtext");
+
ENDSCRIPT
}
- $r->print("\n