Changeset 27840 for branches/simtest_nebulous_branches/PS-IPP-Config/lib/PS/IPP/Config.pm

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (7 diffs)

branches/simtest_nebulous_branches/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -21 +21 @@
 use IPC::Cmd 0.36 qw( can_run run );
 
-use base qw( Class::Accessor::Fast Exporter );
+use base qw( Exporter Class::Accessor::Fast );
 __PACKAGE__->mk_accessors( qw( path ) );
 
@@ -352 +352 @@
     my $dbuser = metadataLookupStr($self->{_siteConfig}, "DBUSER");
     my $dbpassword = metadataLookupStr($self->{_siteConfig}, "DBPASSWORD");
+    my $dbport = metadataLookupStr($self->{_siteConfig}, "DBPORT");
     my $admindb = "ippadmin";
 
@@ -360 +361 @@
 
     my $dsn = "DBI:mysql:host=$dbserver;database=$admindb";
+    $dsn .= ";port=$dbport" if $dbport;     # if $dbport eq "0" we use the default
     my $dbh = DBI->connect($dsn, $dbuser, $dbpassword) or die "Cannot connect to database.\n";
 
@@ -588 +590 @@
     my $scheme = file_scheme($name); # The scheme, e.g., file://, path://
     if (defined $scheme and lc($scheme) eq 'neb') {
-        my $found = eval { $self->nebulous->find_instances( $name ); };
-        ( carp "Unable to find instances of Nebulous handle $name" and return undef ) if $@;
-        return (defined $found ? 1 : 0);
-    }
-
-    return (-f $self->file_resolve($name));
+        my $found = eval { $self->nebulous->find( $name ); };
+        ( carp "Unable to find instance of Nebulous handle $name" and return undef ) if $@;
+        return 0 unless defined $found;
+        return (-f $found and -s $found);
+    }
+
+    return (-f $self->file_resolve($name) and -s $self->file_resolve($name));
 }
 
@@ -653 +656 @@
     my $self = shift;                # Configuration object
     my $name = shift;                # File name to check
+    my $force = shift;               # pass force flag to the delete method
     my $status;
 
     my $scheme = file_scheme($name); # The scheme, e.g., file://, path://
     if (defined $scheme and lc($scheme) eq 'neb') {
-        $status = eval { $self->nebulous->delete( $name ); };
+        $status = eval { $self->nebulous->delete( $name, $force ); };
         ( carp "Unable to delete Nebulous handle $name" and return undef ) if $@;
     } else {
@@ -1266 +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($outname)) {
+            carp "Can't delete zero-sized skycell";
+            return 0;
+        }
+        $outnameResolved = undef;
     }
 
@@ -1281 +1288 @@
         $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 ) =