Changeset 26193

Timestamp:

Nov 19, 2009, 10:44:27 AM (16 years ago)

Author:

bills

Message:

change -listtarget to -listtargets because I keep typing it wrong.
in -updateinterest accept -dest_name as a search parameters

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/disttool_updateinterest.sql (added)
• src/disttool.c (modified) (6 diffs)
• src/disttool.h (modified) (1 diff)
• src/disttoolConfig.c (modified) (3 diffs)

trunk/ippTools/share/Makefile.am

@@ -138 +138 @@
      disttool_revertfileset.sql \
      disttool_toadvance.sql \
+     disttool_updateinterest.sql \
      disttool_updatercrun.sql \
      faketool_change_exp_state.sql \

trunk/ippTools/src/disttool.c

@@ -52 +52 @@
 static bool definetargetMode(pxConfig *config);
 static bool updatetargetMode(pxConfig *config);
-static bool listtargetMode(pxConfig *config);
+static bool listtargetsMode(pxConfig *config);
 
 static bool definedestinationMode(pxConfig *config);
@@ -100 +100 @@
         MODECASE(DISTTOOL_MODE_DEFINETARGET, definetargetMode);
         MODECASE(DISTTOOL_MODE_UPDATETARGET, updatetargetMode);
-        MODECASE(DISTTOOL_MODE_LISTTARGET, listtargetMode);
+        MODECASE(DISTTOOL_MODE_LISTTARGETS, listtargetsMode);
         MODECASE(DISTTOOL_MODE_DEFINEDESTINATION, definedestinationMode);
         MODECASE(DISTTOOL_MODE_UPDATEDESTINATION, updatedestinationMode);
@@ -1311 +1311 @@
 }
 
-static bool listtargetMode(pxConfig *config)
+static bool listtargetsMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -1611 +1611 @@
     PXOPT_COPY_S64(config->args, where, "-dest_id",   "dest_id", "==");
     PXOPT_COPY_S64(config->args, where, "-target_id", "target_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-dest_name", "rcDestination.name", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-filter", "filter", "LIKE");
 
@@ -1619 +1620 @@
         return false;
     }
-    psString query = NULL;
-    psStringAppend(&query, "UPDATE rcInterest join distTarget using(target_id) SET rcInterest.state = '%s'", state);
+    psString query = pxDataGet("disttool_updateinterest.sql");
 
     if (psListLength(where->list)) {
@@ -1634 +1634 @@
     psFree(where);
 
-    if (!p_psDBRunQuery(config->dbh, query)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);

trunk/ippTools/src/disttool.h

@@ -47 +47 @@
     DISTTOOL_MODE_DEFINETARGET,
     DISTTOOL_MODE_UPDATETARGET,
-    DISTTOOL_MODE_LISTTARGET,
+    DISTTOOL_MODE_LISTTARGETS,
     DISTTOOL_MODE_DEFINEINTEREST,
     DISTTOOL_MODE_UPDATEINTEREST,

trunk/ippTools/src/disttoolConfig.c

@@ -263 +263 @@
     psMetadataAddStr(updatetargetArgs, PS_LIST_TAIL, "-set_state", 0, "define new state", NULL);
 
-    // -listtarget
-    psMetadata *listtargetArgs = psMetadataAlloc();
-    psMetadataAddS64(listtargetArgs, PS_LIST_TAIL, "-target_id", 0, "list target with target_id", 0);
-    psMetadataAddStr(listtargetArgs, PS_LIST_TAIL, "-dist_group",  0, "list targets for dist_group", NULL);
-    psMetadataAddStr(listtargetArgs, PS_LIST_TAIL, "-filter",    0, "define filter", NULL);
-    psMetadataAddStr(listtargetArgs, PS_LIST_TAIL, "-stage",     0, "list targets for stage", NULL);
-    psMetadataAddBool(listtargetArgs, PS_LIST_TAIL,"-clean",     0, "list clean targets", false);
-    psMetadataAddBool(listtargetArgs, PS_LIST_TAIL,"-full",      0, "list full targets", false);
-    psMetadataAddStr(listtargetArgs, PS_LIST_TAIL, "-state",     0, "list targets in state", NULL);
-    psMetadataAddU64(listtargetArgs, PS_LIST_TAIL, "-limit",     0, "limit number of targets listed to N", 0);
-    psMetadataAddBool(listtargetArgs, PS_LIST_TAIL, "-simple",  0, "use the simple output format", false);
+    // -listtargets
+    psMetadata *listtargetsArgs = psMetadataAlloc();
+    psMetadataAddS64(listtargetsArgs, PS_LIST_TAIL, "-target_id", 0, "list target with target_id", 0);
+    psMetadataAddStr(listtargetsArgs, PS_LIST_TAIL, "-dist_group",  0, "list targets for dist_group", NULL);
+    psMetadataAddStr(listtargetsArgs, PS_LIST_TAIL, "-filter",    0, "define filter", NULL);
+    psMetadataAddStr(listtargetsArgs, PS_LIST_TAIL, "-stage",     0, "list targets for stage", NULL);
+    psMetadataAddBool(listtargetsArgs, PS_LIST_TAIL,"-clean",     0, "list clean targets", false);
+    psMetadataAddBool(listtargetsArgs, PS_LIST_TAIL,"-full",      0, "list full targets", false);
+    psMetadataAddStr(listtargetsArgs, PS_LIST_TAIL, "-state",     0, "list targets in state", NULL);
+    psMetadataAddU64(listtargetsArgs, PS_LIST_TAIL, "-limit",     0, "limit number of targets listed to N", 0);
+    psMetadataAddBool(listtargetsArgs, PS_LIST_TAIL, "-simple",  0, "use the simple output format", false);
 
     // -defineinterest
@@ -294 +294 @@
     psMetadataAddStr(updateinterestArgs, PS_LIST_TAIL, "-set_state", 0, "define state (required)", NULL);
     psMetadataAddStr(updateinterestArgs, PS_LIST_TAIL, "-filter",    0, "define filter (LIKE comparison)", NULL);
+    psMetadataAddStr(updateinterestArgs, PS_LIST_TAIL, "-dest_name",    0, "define destination name", NULL);
 
     // -listinterests
@@ -338 +339 @@
     PXOPT_ADD_MODE("-definetarget",       "", DISTTOOL_MODE_DEFINETARGET, definetargetArgs);
     PXOPT_ADD_MODE("-updatetarget",       "", DISTTOOL_MODE_UPDATETARGET, updatetargetArgs);
-    PXOPT_ADD_MODE("-listtarget",         "", DISTTOOL_MODE_LISTTARGET, listtargetArgs);
+    PXOPT_ADD_MODE("-listtargets",         "", DISTTOOL_MODE_LISTTARGETS, listtargetsArgs);
 
     PXOPT_ADD_MODE("-defineinterest",     "", DISTTOOL_MODE_DEFINEINTEREST, defineinterestArgs);