--- loncom/lonnet/perl/lonrep.pm 1999/10/13 17:48:51 1.1 +++ loncom/lonnet/perl/lonrep.pm 2000/01/13 14:48:36 1.2 @@ -5,13 +5,13 @@ # 5/21/99,5/22,5/29,5/31,6/15 Gerd Kortemeyer) # 6/16,6/18 Gerd Kortemeyer) # 6/18,6/21,6/26,6/28,6/29,6/30, -# 7/2,7/3,7/9,7/10,7/12 Gerd Kortemeyer +# 7/2,7/3,7/9,7/10,7/12, +# 01/06 Gerd Kortemeyer package Apache::lonrep; use strict; use Apache::Constants qw(:common :http); -use LWP::UserAgent(); use Apache::lonnet(); use Apache::File(); @@ -21,8 +21,7 @@ sub handler { return OK; } else { my $filename=$r->filename.$r->path_info; - my $transname="$filename.in.transfer"; - if (-e $transname) { + if (-e "$filename.in.transfer") { sleep 10; $r->filename($filename); if (-e $r->finfo) { @@ -32,42 +31,9 @@ sub handler { return HTTP_SERVICE_UNAVAILABLE; } } else { - my $remoteurl=Apache::lonnet::subscribe($filename); - if ($remoteurl eq 'con_lost') { - $r->log_reason("Subscribe returned con_lost",$filename); - return HTTP_SERVICE_UNAVAILABLE; - } elsif ($remoteurl eq 'not_found') { - $r->log_reason("Subscribe returned not_found",$filename); - return HTTP_NOT_FOUND; - } elsif ($remoteurl eq 'forbidden') { - $r->log_reason("Subscribe returned forbidden",$filename); - return FORBIDDEN; - } else { - my @parts=split(/\//,$filename); - my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]"; - my $count; - for ($count=5;$count<$#parts;$count++) { - $path.="/$parts[$count]"; - if ((-e $path)!=1) { - mkdir($path,0777); - } - } - my $ua=new LWP::UserAgent; - my $request=new HTTP::Request('GET',"$remoteurl"); - my $response=$ua->request($request,$transname); - if ($response->is_error()) { - unlink($transname); - my $message=$response->status_line; - $r->log_reason("LWP GET: $message",$filename); - return HTTP_SERVICE_UNAVAILABLE; - } else { - rename($transname,$filename); - $r->filename($filename); - return OK; - } - } + return Apache::lonnet::repcopy($filename); } - } + } } 1;