Changeset 27543

Timestamp:

Mar 31, 2010, 10:59:49 AM (16 years ago)

Author:

Paul Price

Message:

Handle zero-sized skycell files.

File:

• trunk/PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (2 diffs)

trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -1270 +1270 @@
     $tess_dir = $self->convert_filename_absolute( $tess_dir ) or return undef;
 
-    my $outnameResolved;
+    my $outnameResolved = $self->file_resolve( $outname, 0 );
 
     # check if file actually exists
-    if ($self->file_exists( $outname )) {
-        # double check that the file is not zero-length (eg: dvoImageExtract crashed)
-        $outnameResolved = $self->file_resolve( $outname, 1 ) or return undef; # Resolved filename, for Nebulous
-        my @stats = stat($outnameResolved);
-        if ($stats[7]) {
+    if (defined $outnameResolved and -f $outnameResolved) {
+        if (-s $outnameResolved) {
+            # Exists and has non-zero size
             return 1;
+        }
+        if (!$self->file_delete($name)) {
+            carp "Can't delete zero-sized skycell";
+            return 0;
         }
     }
@@ -1285 +1287 @@
         $outnameResolved = $self->file_create( $outname ) or return undef; # Resolved filename, for Nebulous
     }
+
     my $command = "$dvoImageExtract -D CATDIR $tess_dir $skycell_id -o $outnameResolved";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =