Changeset 36253

Timestamp:

Oct 28, 2013, 4:40:35 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130904

Files:

• ippScripts/scripts/chip_imfile.pl (modified) (1 prop)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/dist_bundle.pl (modified) (1 diff)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/lap_science.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippScripts/scripts/publish_file.pl (modified) (1 prop)
• ippScripts/scripts/rawcheck.pl (copied) (copied from trunk/ippScripts/scripts/rawcheck.pl )
• ippScripts/scripts/warp_skycell.pl (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/disttool_definebyquery_chip.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/camtool.c (modified) (1 prop)
• ippTools/src/camtoolConfig.c (modified) (1 prop)
• ippTools/src/disttool.c (modified) (2 diffs)
• ippTools/src/disttoolConfig.c (modified) (1 diff)
• ippTools/src/magictool.c (modified) (1 prop)

branches/eam_branches/ipp-20130904/ippScripts/scripts/dist_bundle.pl

@@ -198 +198 @@
         next if $file_rule =~ /LOG/;
         next if $file_rule =~ /BIN/;
+
+        # chip stage cmf files are not regenerated after cleanup so don't complain if
+        # they are missing. They are of limited utility anyways. USE the smfs
+        next if ($stage eq 'chip' and $file_rule eq 'PSPHOT.OUTPUT');
 
         &my_die("failed to resolve  $file_name", $component, $PS_EXIT_DATA_ERROR);

branches/eam_branches/ipp-20130904/ippTools/share/disttool_definebyquery_chip.sql

@@ -20 +20 @@
 WHERE distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL      -- no existing distRun 
     AND ((chipRun.state = 'full') OR (distTarget.clean AND chipRun.state = 'cleaned'))

branches/eam_branches/ipp-20130904/ippTools/src/disttool.c

@@ -677 +677 @@
     PXOPT_COPY_S64(config->args, where, "-stage_id", "stage_id", "==");
     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
-    PXOPT_COPY_STR(config->args, where, "-data_group", "data_group", "==");
+    PXOPT_COPY_STR(config->args, where, "-data_group", "distRun.data_group", "LIKE");
 
     // require data_group or dist_id to be supplied
@@ -759 +759 @@
 
     query = "DELETE FROM distComponent where dist_id = %" PRId64;
-    char *query2 =  "DELETE from rcDSFileset using distRun, rcDSFileset WHERE distRun.dist_id = rcDSFileset.dist_id AND rcDSFileset.state ='cleaned' AND dist_id = %" PRId64;
+    char *query2 =  "DELETE from rcDSFileset using distRun, rcDSFileset WHERE distRun.dist_id = rcDSFileset.dist_id AND rcDSFileset.state ='cleaned' AND rcDSFileset.dist_id = %" PRId64;
     
     for (long i=0; i < psArrayLength(output); i++) {

branches/eam_branches/ipp-20130904/ippTools/src/disttoolConfig.c

@@ -91 +91 @@
     // -startover
     psMetadata *startoverArgs = psMetadataAlloc();
-    psMetadataAddStr(startoverArgs, PS_LIST_TAIL, "-data_group",    0, "define data_group", NULL);
+    psMetadataAddStr(startoverArgs, PS_LIST_TAIL, "-data_group",    0, "define data_group (LIKE comparison)", NULL);
     psMetadataAddS64(startoverArgs, PS_LIST_TAIL, "-dist_id", 0, "search by dist_id", 0);
     psMetadataAddStr(startoverArgs, PS_LIST_TAIL, "-stage",    0, "search by stage", NULL);