Changeset 16727

Timestamp:

Feb 28, 2008, 2:57:50 PM (18 years ago)

Author:

Paul Price

Message:

Combining generate_skycells and skycell_file from Operations.pm into a
single function that produces a single skycell file (using
dvoImageExtract). This is necessary because we're moving to a model
where the outroot name is provided to the scripts, rather than being
generated by the scripts --- so there's no workdir at the script
level, which would tell the script where it might possibly find the
skycell file, so we have to generate a new one each time.

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.76 2008-02-22 20:20:37 eugene Exp $
+# $Id: Config.pm,v 1.77 2008-02-29 00:57:50 price Exp $
 
 package PS::IPP::Config;
@@ -1023 +1023 @@
 }
 
+sub skycell_file
+{
+    my $self = shift;           # Configuration object
+    my $tess_id = shift;        # Tessellation identifier
+    my $skycell_id = shift;     # Skycell identifier
+    my $outname = shift;        # Output name
+    my $verbose = shift;        # Verbose?
+
+    unless (defined $self and defined $tess_id and defined $skycell_id and defined $outname) {
+        carp "Input parameters not defined";
+        return 0;
+    }
+
+    my $dvoImageExtract = can_run('dvoImageExtract') or die "Can't find dvoImageExtract";
+    
+    my $tess_dir = $self->tessellation_catdir( $tess_id ); # Tessellation catdir for DVO
+    unless (defined $tess_dir) {
+        carp "Can't get list of tessellations.";
+        return 0;
+    }
+    $tess_dir = $self->convert_filename_absolute( $tess_dir );
+
+    unless ($self->file_exists( $outName )) {
+        my $outNameResolved = $self->file_create( $outName ); # 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 ) =
+            run(command => $command, verbose => $verbose);
+        die "Unable to perform dvoImageExtract for $tess_id $skycell_id\n" unless ($success and $self->file_exists( $outName ));
+    }
+
+    return 1;
+}
+
 # Interpolate environment variables in a directory (or colon-delimited list of directories)
 sub _interpolate_env