Changeset 29124 for branches/eam_branches/ipp-20100823/ippTools

Timestamp:

Sep 7, 2010, 9:16:10 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20100823

Files:

• . (modified) (1 prop)
• ippTools/configure.ac (modified) (1 diff)
• ippTools/share/magicdstool_tocleanup.sql (modified) (2 diffs)
• ippTools/src/disttool.c (modified) (1 diff)
• ippTools/src/disttoolConfig.c (modified) (1 diff)
• ippTools/src/staticskytool.c (modified) (1 diff)

branches/eam_branches/ipp-20100823/ippTools/configure.ac

@@ -19 +19 @@
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.1.0])
 PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.63]) 
-PKG_CHECK_MODULES([PPSTAMP], [ippdb >= 1.1.63]) 
+PKG_CHECK_MODULES([PPSTAMP], [ppstamp >= 0.1.1]) 
 
 PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${PPSTAMP_CFLAGS=} ${IPPDB_CFLAGS=}"

branches/eam_branches/ipp-20100823/ippTools/share/magicdstool_tocleanup.sql

@@ -1 +1 @@
 SELECT
     magic_ds_id,
+    stage,
     magicDSRun.state,
     magicDSRun.outroot,
@@ -9 +10 @@
 WHERE magicDSRun.state = 'goto_cleaned'
 -- XXX: need to add fault to magicDSRun
+-- XXX: the database has been updated, but fault isn't yet used
 --    AND magicDSRun.fault = 0
 

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

@@ -519 +519 @@
     PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");;
     PXOPT_COPY_STR(config->args, where, "-state", "distRun.state", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-data_group", "distRun.data_group", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-dist_group", "distTarget.dist_group", "==");

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

@@ -76 +76 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-stage",     0, "value for stage", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state",     0, "value for state", NULL);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label",     0, "limit updates to label", NULL);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group",     0, "limit updates to data_group", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label",     0, "limit updates to label (LIKE comparison)", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group",     0, "limit updates to data_group (LIKE comparison)", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-dist_group",     0, "limit updates to data_group", NULL);
     psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-time_stamp_begin", 0, "limit updates by time_stamp (>=)", NULL); 

branches/eam_branches/ipp-20100823/ippTools/src/staticskytool.c

@@ -290 +290 @@
                                 workdir,
                                 label,
-                                data_group,
+                                data_group ? data_group : label,
                                 dist_group,
                                 reduction,