Changeset 25840

Timestamp:

Oct 14, 2009, 12:22:54 PM (17 years ago)

Author:

bills

Message:

pass name of table to pxUpdateRun to disambiguate values in the joined tables.
fix a couple of other little problems

Location:

trunk/ippTools/src

Files:

• addtool.c (modified) (1 diff)
• camtool.c (modified) (1 diff)
• chiptool.c (modified) (1 diff)
• difftool.c (modified) (1 diff)
• difftoolConfig.c (modified) (1 diff)
• faketool.c (modified) (1 diff)
• faketoolConfig.c (modified) (1 diff)
• pxtools.c (modified) (2 diffs)
• pxtools.h (modified) (1 diff)
• stacktool.c (modified) (1 diff)
• warptool.c (modified) (1 diff)

trunk/ippTools/src/addtool.c

@@ -266 +266 @@
 
     // pxUpdateRun gets parameters from config->args and runs the update query
-    bool result = pxUpdateRun(config, where, &query, false);
+    bool result = pxUpdateRun(config, where, &query, "addRun", false);
 
     psFree(query);

trunk/ippTools/src/camtool.c

@@ -265 +265 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, true);
+    bool result = pxUpdateRun(config, where, &query, "camRun", true);
     if (!result) {
         psError(PXTOOLS_ERR_DATA, false, "pxUpdateRun failed");

trunk/ippTools/src/chiptool.c

@@ -320 +320 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, true);
+    bool result = pxUpdateRun(config, where, &query, "chipRun", true);
     if (!result) {
         psError(PXTOOLS_ERR_DATA, false, "pxUpdateRun failed");

trunk/ippTools/src/difftool.c

@@ -198 +198 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, true);
+    bool result = pxUpdateRun(config, where, &query, "diffRun", true);
 
     psFree(query);

trunk/ippTools/src/difftoolConfig.c

@@ -61 +61 @@
     // -updaterun
     psMetadata *updaterunArgs = psMetadataAlloc();
-    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-diff_id", 0,            "define diff ID (required)", 0);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,            "set state (required)", NULL);
+    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-diff_id", 0,          "define diff ID", 0);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,            "set state", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0,            "define by label instead of diff ID", 0);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0,        "define new value for label", 0);

trunk/ippTools/src/faketool.c

@@ -346 +346 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, true);
+    bool result = pxUpdateRun(config, where, &query, "fakeRun", true);
     if (!result) {
         psError(PXTOOLS_ERR_DATA, false, "pxUpdateRun failed");

trunk/ippTools/src/faketoolConfig.c

@@ -142 +142 @@
     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sun_angle_min",  0,            "define min solar angle", NAN);
     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sun_angle_max",  0,            "define max solar angle", NAN);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-dist_group", 0, "search by data_group", NULL);
 
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0,            "set state", NULL);

trunk/ippTools/src/pxtools.c

@@ -110 +110 @@
 
 // shared code for updating the various strings for a Run
-bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, bool has_dist_group)
+bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString table, bool has_dist_group)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -150 +150 @@
     char *comma = ",";
 
-#   define addColumn(_val) \
+#   define addColumn(_tab, _val) \
         do { \
             if (_val) { \
-                psStringAppend(pQuery, "%s %s = '%s'", separator, #_val, _val); \
+                psStringAppend(pQuery, "%s %s.%s = '%s'", separator, _tab, #_val, _val); \
                 separator = comma; \
             } \
         } while (0)
 
-    addColumn(state);
-    addColumn(data_group);
+    addColumn(table, state);
+    addColumn(table, data_group);
     if (has_dist_group) {
-        addColumn(dist_group);
+        addColumn(table, dist_group);
     }
-    addColumn(note);
-    addColumn(label);
+    addColumn(table, note);
+    addColumn(table, label);
 
     psString whereClause =  psDBGenerateWhereSQL(where, NULL);

trunk/ippTools/src/pxtools.h

@@ -63 +63 @@
 bool pxGetOptions(FILE *stream, int argc, char **argv, pxConfig *config, psMetadata *modes, psMetadata *argSets);
 
-bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, bool has_dist_group);
+bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString table, bool has_dist_group);
 
 #define PXOPT_ADD_MODE(option, comment, modeval, argset) \

trunk/ippTools/src/stacktool.c

@@ -600 +600 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, true);
+    bool result = pxUpdateRun(config, where, &query, "stackRun", true);
 
     psFree(query);

trunk/ippTools/src/warptool.c

@@ -397 +397 @@
 
     // pxUpdateRun gets parameters from config->args and updates
-    bool result = pxUpdateRun(config, where, &query, true);
+    bool result = pxUpdateRun(config, where, &query, "warpRun", true);
 
     psFree(query);