Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippTools/src/magicdstoolConfig.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/magicdstoolConfig.c (modified) (4 diffs)

branches/cnb_branches/cnb_branch_20090301/ippTools/src

@@ -33 +33 @@
 pstamptool
 disttool
+receivetool

@@ -33 +33 @@
 pstamptool
 disttool
+receivetool

branches/cnb_branches/cnb_branch_20090301/ippTools/src/magicdstoolConfig.c

@@ -88 +88 @@
     psMetadataAddS64(todestreakArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magic Destreak ID", 0);
     psMetadataAddS64(todestreakArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic ID", 0);
-    psMetadataAddStr(todestreakArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL);
+    psMetadataAddStr(todestreakArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "define label", NULL);
     psMetadataAddU64(todestreakArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
     psMetadataAddBool(todestreakArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
@@ -99 +99 @@
     psMetadataAddStr(adddestreakedfileArgs, PS_LIST_TAIL, "-recovery_path_base", 0, "define recovery pixels URI", NULL);
     psMetadataAddBool(adddestreakedfileArgs, PS_LIST_TAIL, "-setmagicked", 0, "update the magicked state of the file", false);
-    psMetadataAddS16(adddestreakedfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0);
+    psMetadataAddS16(adddestreakedfileArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0);
 
     // -revertdestreakedfile
@@ -105 +105 @@
     psMetadataAddS64(revertdestreakedfileArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "search by magictool de-streak ID", 0);
     psMetadataAddStr(revertdestreakedfileArgs, PS_LIST_TAIL, "-component", 0, "search by component", NULL);
-    psMetadataAddS16(revertdestreakedfileArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0);
+    psMetadataAddS16(revertdestreakedfileArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
 
     // -getskycells
@@ -125 +125 @@
     PXOPT_ADD_MODE("-updaterun",           "update state of magic de-streak run",
                     MAGICDSTOOL_MODE_UPDATERUN,         updaterunArgs);
-    PXOPT_ADD_MODE("-todestreak",          "show pending files",    
+    PXOPT_ADD_MODE("-todestreak",          "show pending files",
                     MAGICDSTOOL_MODE_TODESTREAK,       todestreakArgs);
     PXOPT_ADD_MODE("-adddestreakedfile",   "add a de-streaked file",

@@ -33 +33 @@
 pstamptool
 disttool
+receivetool