[BACK]Return to lonratsrv.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / rat

Diff for /rat/lonratsrv.pm between versions 1.23 and 1.25

version 1.23, 2002/09/05 19:37:00 version 1.25, 2004/02/11 00:10:01
Line 31 Line 31
 # 05/29/00,05/30 Gerd Kortemeyer)  # 05/29/00,05/30 Gerd Kortemeyer)
 # 7/1 Gerd Kortemeyer)  # 7/1 Gerd Kortemeyer)
 # 7/1,7/3,7/4,7/7,7/8,7/10,7/26,10/2 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  # 5/3,06/25,07/03,07/04,07/05 Gerd Kortemeyer
   
 package Apache::lonratsrv;  package Apache::lonratsrv;
Line 68  sub qtunescape { Line 67  sub qtunescape {
   
 sub loadmap {  sub loadmap {
     my ($fn,$errtext)=@_;      my ($fn,$errtext)=@_;
       if ($errtext) { return('',$errtext); }
     my $outstr='';      my $outstr='';
     my @obj=();      my @obj=();
     my @links=();      my @links=();
Line 82  sub loadmap { Line 82  sub loadmap {
         }          }
         $instr=join('',@content);          $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 $parser = HTML::TokeParser->new(\$instr);
         my $token;          my $token;
         my $graphmode=0;          my $graphmode=0;
Line 294  sub savemap { Line 296  sub savemap {
  if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\//) {   if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\//) {
     $ENV{'form.output'}=$outstr;      $ENV{'form.output'}=$outstr;
             my $home=&Apache::lonnet::homeserver($2,$1);              my $home=&Apache::lonnet::homeserver($2,$1);
             &Apache::lonnet::finishuserfileupload(              my $result=&Apache::lonnet::finishuserfileupload($2,$1,$home,
               $2,$1,$home,         'output',(split(/\//,$fn))[-1]);
               'output',(split(/\//,$fn))[-1]);      if ($result != m|^/uploaded/|) {
    $errtext.='Map not saved: A network error occured when trying to save the map. ';
       }
         } else {          } else {
           my $fh;            my $fh;
           if ($fh=Apache::File->new(">$fn")) {            if ($fh=Apache::File->new(">$fn")) {
Removed from v.1.23  
changed lines
  Added in v.1.25

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>