[BACK]Return to lonrep.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonrep.pm between versions 1.12 and 1.13

version 1.12, 2007/01/29 22:07:12 version 1.13, 2007/04/26 01:18:47
Line 39  sub update_filename { Line 39  sub update_filename {
     my $oldfile = $r->filename($filename);      my $oldfile = $r->filename($filename);
     if ($ENV{'MOD_PERL_API_VERSION'} == 2      if ($ENV{'MOD_PERL_API_VERSION'} == 2
  && -e $filename) {   && -e $filename) {
  require APR::Finfo;   eval {
  require APR::Const;      require APR::Finfo;
  $r->finfo(APR::Finfo::stat($filename,       require APR::Const;
    &APR::Const::FINFO_NORM(),      $r->finfo(APR::Finfo::stat($filename, 
    $r->pool));         &APR::Const::FINFO_NORM(),
          $r->pool));
    };
    if ($@) {
       return $@;
    }
     }      }
     return $oldfile;      return;
 }  }
   
 sub handler {  sub handler {
Line 58  sub handler { Line 63  sub handler {
       if (-e "$filename.in.transfer") {        if (-e "$filename.in.transfer") {
  sleep 10;   sleep 10;
         if (-e $filename) {          if (-e $filename) {
     &update_filename($r,$filename);      my $error = &update_filename($r,$filename);
       if ($error) {
    $r->log_reason('Update filename failed '.$error);
    return HTTP_SERVICE_UNAVAILABLE;
       }
     return OK;      return OK;
         } else {          } else {
     $r->log_reason("Waiting for file transfer timed out",$filename);      $r->log_reason("Waiting for file transfer timed out",$filename);
     return HTTP_SERVICE_UNAVAILABLE;      return HTTP_SERVICE_UNAVAILABLE;
         }          }
       } else {        } else {
           my $response=Apache::lonnet::repcopy($filename);            my $response=&Apache::lonnet::repcopy($filename);
           if ($response eq 'ok' && -e $filename) {            if ($response eq 'ok' && -e $filename) {
       $r->path_info('');        $r->path_info('');
       &update_filename($r,$filename);        my $error = &update_filename($r,$filename);
         if ($error) {
     $r->log_reason('Update filename failed after replication '.$error);
     return HTTP_SERVICE_UNAVAILABLE;
         }
               return OK;                return OK;
           }            }
           my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));            my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
Removed from v.1.12  
changed lines
  Added in v.1.13

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