Diff for /rat/lonratsrv.pm between versions 1.16 and 1.19

version 1.16, 2001/11/29 19:23:49 version 1.19, 2002/06/27 16:43:57
Line 197  sub loadmap { Line 197  sub loadmap {
 # ----------------------------------------------------------- Saves map to disk  # ----------------------------------------------------------- Saves map to disk
   
 sub savemap {  sub savemap {
     my ($fn,$errtext)=@_;      my ($fn,$errtext,$r)=@_;
     my %alltypes;      my %alltypes;
     my %allvalues;      my %allvalues;
     if (($fn=~/\.sequence$/) ||      if (($fn=~/\.sequence$/) ||
Line 290  sub savemap { Line 290  sub savemap {
              print $fh $outstr;               print $fh $outstr;
              $errtext.="Map saved as $fn. ";               $errtext.="Map saved as $fn. ";
   } else {    } else {
              $errtext.='Could not write file $fn. Map not saved. ';               $errtext.='Could not write file '.$fn.'.  Map not saved. ';
   }    }
         }          }
     } else {      } else {
 # -------------------------------------------- Cannot write to that file, error  # -------------------------------------------- Cannot write to that file, error
         $errtext.='Map not saved: The specified path does not exist. ';          $errtext.='Map not saved: The specified '.$fn.' path does not exist. '.$r->uri();
     }      }
     return $errtext;      return $errtext;
 }  }
Line 316  sub handler { Line 316  sub handler {
   $url=~s/\/loadonly\/ratserver$/\/save\/ratserver/;    $url=~s/\/loadonly\/ratserver$/\/save\/ratserver/;
       
   my $fn=$r->filename;    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 $errtext='';
   my $outtext='';    my $outtext='';
   
   if ($mode ne 'loadonly') {    if ($mode ne 'loadonly') {
      $errtext=&savemap($fn,$errtext);       $errtext=&savemap($fn,$errtext,$r);
   }    }
   ($outtext,$errtext)=&loadmap($fn,$errtext);    ($outtext,$errtext)=&loadmap($fn,$errtext);
   

Removed from v.1.16  
changed lines
  Added in v.1.19


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