Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippTools/src/magicdstool.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/magicdstool.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/magicdstool.c

@@ -398 +398 @@
     PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "==");
     PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -599 +599 @@
 
     // default values
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
     PXOPT_LOOKUP_STR(backup_path_base, config->args, "-backup_path_base", false, false);
     PXOPT_LOOKUP_STR(recovery_path_base, config->args, "-recovery_path_base", false, false);
     PXOPT_LOOKUP_BOOL(setmagicked, config->args, "-setmagicked", false);
 
-    if (setmagicked && (code != 0)) {
+    if (setmagicked && (fault != 0)) {
         psError(PS_ERR_UNKNOWN, true, " cannot setmagicked for faulted file");
         return false;
@@ -625 +625 @@
     }
 
-    if (!magicDSFileInsert(config->dbh, magic_ds_id, component, backup_path_base, recovery_path_base, code)) {
+    if (!magicDSFileInsert(config->dbh, magic_ds_id, component, backup_path_base, recovery_path_base, fault)) {
             // rollback
         if (!psDBRollback(config->dbh)) {
@@ -781 +781 @@
     PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magic_ds_id", "==");
     PXOPT_COPY_STR(config->args, where, "-component", "component", "==");
-    PXOPT_COPY_S16(config->args, where, "-code", "fault", "==");
+    PXOPT_COPY_S16(config->args, where, "-fault", "fault", "==");
 
     psString query = psStringCopy("DELETE FROM magicDSFile WHERE fault != 0");

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