Changeset 36253 for branches/eam_branches/ipp-20130904/ippTools/src

Timestamp:

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

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130904/ippTools/src

Files:

• . (modified) (1 prop)
• camtool.c (modified) (1 prop)
• camtoolConfig.c (modified) (1 prop)
• disttool.c (modified) (2 diffs)
• disttoolConfig.c (modified) (1 diff)
• magictool.c (modified) (1 prop)

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);