Changeset 20788

Timestamp:

Nov 17, 2008, 3:55:05 PM (17 years ago)

Author:

bills

Message:

some name changes

Location:

trunk/ippTools/src

Files:

• magicdstool.c (modified) (3 diffs)
• magicdstoolConfig.c (modified) (1 diff)

trunk/ippTools/src/magicdstool.c

@@ -482 +482 @@
     // default values
     PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
-    PXOPT_LOOKUP_STR(backup_uri, config->args, "-backup_uri", false, false);
-    PXOPT_LOOKUP_STR(recovery_uri, config->args, "-recovery_uri", 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);
 
     if (!psDBTransaction(config->dbh)) {
@@ -491 +491 @@
 
 
-    if (!magicDSImfileInsert(config->dbh, magic_ds_id, component, backup_uri, recovery_uri, code)) {
+    if (!magicDSFileInsert(config->dbh, magic_ds_id, component, backup_path_base, recovery_path_base, code)) {
             // rollback
         if (!psDBRollback(config->dbh)) {
@@ -573 +573 @@
     PXOPT_COPY_S16(config->args, where, "-code", "fault", "==");
 
-    psString query = psStringCopy("DELETE FROM magicDSImfile WHERE fault != 0");
+    psString query = psStringCopy("DELETE FROM magicDSFile WHERE fault != 0");
 
     if (psListLength(where->list)) {

trunk/ippTools/src/magicdstoolConfig.c

@@ -96 +96 @@
     psMetadataAddS64(adddestreakedfileArgs, PS_LIST_TAIL, "-magic_ds_id", 0, "define magictool ID (required)", 0);
     psMetadataAddStr(adddestreakedfileArgs, PS_LIST_TAIL, "-component", 0, "define component name (required)", NULL);
-    psMetadataAddStr(adddestreakedfileArgs, PS_LIST_TAIL, "-backup_uri", 0, "define backup URI", NULL);
-    psMetadataAddStr(adddestreakedfileArgs, PS_LIST_TAIL, "-recovery_uri", 0, "define recovery pixels URI", NULL);
+    psMetadataAddStr(adddestreakedfileArgs, PS_LIST_TAIL, "-backup_path_base", 0, "define backup URI", NULL);
+    psMetadataAddStr(adddestreakedfileArgs, PS_LIST_TAIL, "-recovery_path_base", 0, "define recovery pixels URI", NULL);
     psMetadataAddS16(adddestreakedfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0);