Changeset 39160 for trunk

Timestamp:

Nov 18, 2015, 2:33:35 PM (11 years ago)

Author:

heather

Message:

addstar diff.inv.cmf seems to be working now

Location:

trunk

Files:

• ippScripts/scripts/addstar_multi_run.pl (modified) (1 diff)
• ippTasks/addstar.pro (modified) (1 diff)

trunk/ippScripts/scripts/addstar_multi_run.pl

@@ -138 +138 @@
             print "there are $num_components\n";
             foreach my $comp  (@$components) {
-            my  $mparsed = $comp->{stageroot};
+                my  $mparsed = $comp->{stageroot};
             
-            if (!defined($mparsed)) {
-                &my_die("Unable to parse stageroot", $stage_id,$stage,$label, $PS_EXIT_PROG_ERROR);
-            } #but just to make sure, have it grab a minidvodb_name, to make sure it's not junk.
-            print "found a value for stageroot:$mparsed\n";
-            my $fpaObjects = $mparsed.'.cmf';
-            my $realFile = $ipprc->file_resolve($fpaObjects);
-            if (!defined($realFile)) {
-                &my_die("unable to resolve real file from $mparsed",$stage_id, $stage, $label, 7);
-            }
-            printf TEMPLIST "$realFile = $fpaObjects\n";
-            if ($stage == 'diff' && $use_diff_inv) {
-                my $fpaObjectsInv = $mparsed.'.inv.cmf';
-                my $realFileInv = $ipprc->file_resolve($fpaObjectsInv);
-                if (!defined($realFileInv)) {
+                if (!defined($mparsed)) {
+                    &my_die("Unable to parse stageroot", $stage_id,$stage,$label, $PS_EXIT_PROG_ERROR);
+                } #but just to make sure, have it grab a minidvodb_name, to make sure it's not junk.
+                print "found a value for stageroot:$mparsed\n";
+                my $fpaObjects = $mparsed.'.cmf';
+                my $realFile = $ipprc->file_resolve($fpaObjects);
+                if (!defined($realFile)) {
                     &my_die("unable to resolve real file from $mparsed",$stage_id, $stage, $label, 7);
                 }
-                printf TEMPLIST "$realFileInv = $fpaObjectsInv\n";
-            }
-
-    }
-
-}
-
+                printf TEMPLIST "$realFile = $fpaObjects\n";
+                if ($stage =~ /diff/) { # hardwired  for now$use_diff_inv) {
+                    print "finding the inv.cmf files\n";
+                    my $fpaObjectsInv = $mparsed.'.inv.cmf';
+                    my $realFileInv = $ipprc->file_resolve($fpaObjectsInv);
+                    if (!defined($realFileInv)) {
+                        &my_die("unable to resolve real file from $mparsed",$stage_id, $stage, $label, 7);
+                    }
+                    printf TEMPLIST "$realFileInv = $fpaObjectsInv\n";
+                }
+                
+            }
+
+    }
+}
 close(TEMPLIST);
 print "saved $temp_file here\n";

trunk/ippTasks/addstar.pro

@@ -484 +484 @@
     if ("$STAGE" == "diff")
       #$run = $run --stage_id $STAGE_ID --stage_extra1 $STAGE_EXTRA1
-        $run = $run --stage_id $STAGE_ID --stage_extra1 $STAGE_EXTRA1 --use_diff_inv
+        $run = $run --use_diff_inv --stage_id $STAGE_ID --stage_extra1 $STAGE_EXTRA1 
     end
     if ("$STAGE" == "fullforce")