Changeset 29950 for trunk/ippScripts/scripts/chip_imfile.pl

Timestamp:

Dec 6, 2010, 11:09:25 AM (15 years ago)

Author:

bills

Message:

fixes to allow things to work when outroot is not in nebulous.
removed unecessary rename. $ipprc->prepare_output() does it now

File:

• trunk/ippScripts/scripts/chip_imfile.pl (modified) (6 diffs)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -159 +159 @@
         if (storage_object_exists($configuration, \$gone)) {
             if ($gone) {
-                rename_gone_file($configuration);
                 $configuration = prepare_output('PPIMAGE.CONFIG', $outroot, $class_id, 1);
                 # if we dump the config we need to insure that the config dump represents
@@ -556 +555 @@
             if ($gone) {
                 carp "WARNING: photometry sources storage object exists but all instances are permanently gone";
-                rename_gone_file($outputSources);
                 $make_sources = 1;
             }
@@ -579 +577 @@
             if ($gone) {
                 carp "WARNING: PSF storage object exists but all instances are permanently gone";
-                rename_gone_file($outputPsf);
                 $make_psf = 1;
             }
@@ -613 +610 @@
 sub storage_object_exists
 {
+    return 0 if !$neb;
+
     my $file = shift;
     my $ref_all_gone = shift;
+
 
     my $exists = $neb->storage_object_exists($file);
@@ -678 +678 @@
     return 1;
 }
-sub rename_gone_file
-{
-    # check whether the only instance of file is on a lost volume
-    # XXX: we don't have a proper interface for this. 
-    # For now try to use Bill's hack: the script 'whichnode'
-
-    my $file = shift;
-    $neb->move($file, "$file.gone") or 
-                    &my_die("failed to rename: $file", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
-}
 
 # Prepare to write to an output file
@@ -718 +708 @@
     &my_die("Couldn't find expected output file: $file",  $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($file);
 
-    if ($replicate and (file_scheme($file) eq 'neb')) {
+    if ($replicate and $neb) {
         $ipprc->replicate_file($file) or &my_die("failed to replicate: $file\n",  $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
     }