Changeset 30586 for branches/czw_branch/20101203/ippTools/src/magicdstool.c

Timestamp:

Feb 11, 2011, 4:29:48 PM (15 years ago)

Author:

watersc1

Message:

Trying to merge back into trunk.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ippTools/src/magicdstool.c (modified) (3 diffs)

branches/czw_branch/20101203/ippTools/src/magicdstool.c

@@ -1115 +1115 @@
     psString queryFile = NULL;
     if (state) {
-        if (! strcmp(state, "new") ) {
+        if (! strcmp(state, "new") || !strcmp(state, "goto_restored")) {
             queryFile = "magicdstool_revertdestreakedfile.sql";
         } else if (!strcmp(state, "update")) {
@@ -1724 +1724 @@
     PXOPT_LOOKUP_STR(component, config->args, "-component", false, false);
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(recoveryroot, config->args, "-set_recoveryroot", false, false);
 
     psString query = pxDataGet("magicdstool_setfiletoupdate.sql");
@@ -1734 +1735 @@
     if (label) {
         psStringAppend(&setHook, "\n , magicDSRun.label = '%s'", label);
+    }
+    if (recoveryroot) {
+        psStringAppend(&setHook, "\n , magicDSRun.recoveryroot = '%s'", recoveryroot);
     }