--- loncom/lonnet/perl/lonrep.pm	2006/08/21 15:21:31	1.11
+++ loncom/lonnet/perl/lonrep.pm	2007/10/02 01:09:53	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Replication Manager
 #
-# $Id: lonrep.pm,v 1.11 2006/08/21 15:21:31 albertel Exp $
+# $Id: lonrep.pm,v 1.14 2007/10/02 01:09:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,19 +32,24 @@ use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::File();
-use CGI::Cookie();
 
 sub update_filename {
     my ($r,$filename) = @_;
     my $oldfile = $r->filename($filename);
-    if ($ENV{'MOD_PERL_API_VERSION'} == 2) {
-	require APR::Finfo;
-	require APR::Const;
-	$r->finfo(APR::Finfo::stat($filename, 
-				   &APR::Const::FINFO_NORM(),
-				   $r->pool));
+    if ($ENV{'MOD_PERL_API_VERSION'} == 2
+	&& -e $filename) {
+	eval {
+	    require APR::Finfo;
+	    require APR::Const;
+	    $r->finfo(APR::Finfo::stat($filename, 
+				       &APR::Const::FINFO_NORM(),
+				       $r->pool));
+	};
+	if ($@) {
+	    return $@;
+	}
     }
-    return $oldfile;
+    return;
 }
 
 sub handler {
@@ -56,24 +61,31 @@ sub handler {
       if ($filename=~/\/$/) { return OK; }
       if (-e "$filename.in.transfer") {
 	sleep 10;
-	&update_filename($r,$filename);
-        if (-e $r->finfo) {
-	   return OK;
+        if (-e $filename) {
+	    my $error = &update_filename($r,$filename);
+	    if ($error) {
+		$r->log_reason('Update filename failed '.$error);
+		return HTTP_SERVICE_UNAVAILABLE;
+	    }
+	    return OK;
         } else {
-	   $r->log_reason("Waiting for file transfer timed out",$filename);
-	   return HTTP_SERVICE_UNAVAILABLE;
+	    $r->log_reason("Waiting for file transfer timed out",$filename);
+	    return HTTP_SERVICE_UNAVAILABLE;
         }
       } else {
-          my $response=Apache::lonnet::repcopy($filename);
-          if ($response eq 'ok') {
+          my $response=&Apache::lonnet::repcopy($filename);
+          if ($response eq 'ok' && -e $filename) {
 	      $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;
           }
-          my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-          my $lonid=$cookies{'lonID'};
-          if ($lonid) {
-	     $r->log_reason('Replication failed for '.$lonid->value);
+          my $handle = &Apache::lonnet::check_for_valid_session($r);
+          if ($handle) {
+	     $r->log_reason('Replication failed for '.$handle);
              return $response;
 	  } else {
 	     $r->log_reason('Replication failed for unknown user');