Changeset 31434 for branches/czw_branch/20110406/ippTools/src/pxadd.h

Timestamp:

May 4, 2011, 3:20:38 PM (15 years ago)

Author:

watersc1

Message:

Merging trunk into this branch

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/pxadd.h (modified) (1 diff)

branches/czw_branch/20110406/ippTools/src/pxadd.h

@@ -26 +26 @@
 
 bool pxaddRunSetState(pxConfig *config, psS64 add_id, const char *state);
-bool pxaddRunSetStateByQuery(pxConfig *config, psMetadata *where, const char *state);
+bool pxaddRunSetStateByQuery(pxConfig *config, psMetadata *where, const char *stage, const char *state);
 bool pxaddRunSetLabel(pxConfig *config, psS64 add_id, const char *label);
-bool pxaddRunSetLabelByQuery(pxConfig *config, psMetadata *where, const char *label);
+bool pxaddRunSetLabelByQuery(pxConfig *config, psMetadata *where, const char *stage, const char *label);
 
 bool pxaddQueueByCamID(pxConfig *config,
-                       psS64 cam_id,
+                       char *stage,
+                       psS64 stage_id,
                        char *workdir,
                        char *reduction,