Changeset 26236 for branches/eam_branches/20091113/ippTools/src/disttool.c

Timestamp:

Nov 20, 2009, 4:13:39 PM (17 years ago)

Author:

eugene

Message:

updates from head

File:

• branches/eam_branches/20091113/ippTools/src/disttool.c (modified) (8 diffs)

branches/eam_branches/20091113/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);
@@ -1551 +1551 @@
     PXOPT_COPY_STR(config->args, where, "-dist_group", "dist_group", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-filter", "filter", "LIKE");
-    PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");
+    // if stage is all don't add it to the query (match all stages)
+    if (stage && strcmp(stage, "all")) {
+        PXOPT_COPY_STR(config->args, where, "-stage", "stage", "==");
+    }
 
     psString query = pxDataGet("disttool_defineinterest.sql");
@@ -1611 +1614 @@
     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");
+    PXOPT_COPY_STR(config->args, where, "-dist_group", "dist_group", "LIKE");
 
     PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
@@ -1618 +1624 @@
         return false;
     }
-    psString query = NULL;
-    psStringAppend(&query, "UPDATE rcInterest SET state = '%s'", state);
+    psString query = pxDataGet("disttool_updateinterest.sql");
 
     if (psListLength(where->list)) {
@@ -1633 +1638 @@
     psFree(where);
 
-    if (!p_psDBRunQuery(config->dbh, query)) {
+    if (!p_psDBRunQueryF(config->dbh, query, state)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -1639 +1644 @@
     }
     psFree(query);
+
+    psS64 numUpdated = psDBAffectedRows(config->dbh);
+    printf("updated %" PRId64 " interests\n", numUpdated);
 
     return true;