Changeset 35747 for branches/eam_branches/ipp-20130509/ippTools/src

Timestamp:

Jul 3, 2013, 1:43:50 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509/ippTools/src

Files:

• . (modified) (1 prop)
• bgtool.c (modified) (1 diff)
• camtool.c (modified) (1 prop)
• camtoolConfig.c (modified) (1 prop)
• chiptool.c (modified) (1 diff)
• magictool.c (modified) (1 prop)
• pstamptool.c (modified) (2 diffs)
• pstamptoolConfig.c (modified) (1 diff)

branches/eam_branches/ipp-20130509/ippTools/src/bgtool.c

@@ -774 +774 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where, "-chip_bg_id", "chip_bg_id", "==");
-    pxAddLabelSearchArgs(config, where, "-label", "label", "==");
+    PXOPT_COPY_S64(config->args, where, "-chip_bg_id", "chipBackgroundRun.chip_bg_id", "==");
+    pxAddLabelSearchArgs(config, where, "-label", "chipBackgroundRun.label", "==");
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
 

branches/eam_branches/ipp-20130509/ippTools/src/chiptool.c

@@ -493 +493 @@
     psFree(where);
 
-    psStringAppend(&query, "\nORDER BY priority DESC, chip_id");
+    psStringAppend(&query, "\nORDER BY priority DESC, chip_id, class_id");
 
     // treat limit == 0 as "no limit"

branches/eam_branches/ipp-20130509/ippTools/src/pstamptool.c

@@ -142 +142 @@
     PXOPT_LOOKUP_STR(label,       config->args, "-set_label",         false, false);
     PXOPT_LOOKUP_S32(pollInterval, config->args, "-set_poll_interval",false, false);
-    PXOPT_LOOKUP_BOOL(no_magic, config->args, "-set_no_magic", false);
-
-    bool need_magic = ! no_magic;
 
     if (!pstampDataStoreInsert(config->dbh,
@@ -155 +152 @@
             uri,
             pollInterval,
-            need_magic
+            false
         )) {
         psError(PS_ERR_UNKNOWN, false, "database error");

branches/eam_branches/ipp-20130509/ippTools/src/pstamptoolConfig.c

@@ -51 +51 @@
     psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-set_label",        0, "define datastore label", NULL);
     psMetadataAddS32(adddatastoreArgs, PS_LIST_TAIL, "-set_poll_interval", 0, "define datastore poll interval (seconds)", 60);
-    psMetadataAddBool(adddatastoreArgs,PS_LIST_TAIL, "-set_no_magic",   0, "set magic not required", true);
 
     // -datastore