Changeset 27517 for branches/eam_branches/20100225/ippTools/src/pxtools.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

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

branches/eam_branches/20100225/ippTools/src/pxtools.c

@@ -110 +110 @@
 
 // shared code for updating the various strings for a Run
-bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString table, bool has_dist_group)
+bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString runTable, psString idColumn, psString fileTable, bool has_dist_group)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -116 +116 @@
     PS_ASSERT_PTR_NON_NULL(pQuery, false);
     PS_ASSERT_PTR_NON_NULL(*pQuery, false);
+    PS_ASSERT_PTR_NON_NULL(runTable, false);
+    PS_ASSERT_PTR_NON_NULL(idColumn, false);
+    PS_ASSERT_PTR_NON_NULL(fileTable, false);
 
     // make sure that -state is not the only selection parameter
@@ -158 +161 @@
         } while (0)
 
-    addColumn(table, state);
-    addColumn(table, data_group);
+    addColumn(runTable, state);
+    addColumn(runTable, data_group);
     if (has_dist_group) {
-        addColumn(table, dist_group);
-    }
-    addColumn(table, note);
-    addColumn(table, label);
+        addColumn(runTable, dist_group);
+    }
+    addColumn(runTable, note);
+    addColumn(runTable, label);
+
+    psString joinHook = psStringCopy("");
+    psString fileWhere = NULL;
+    if (state && !strcmp(state, "update")) {
+        psStringAppend(&joinHook, "\n JOIN %s USING(%s)", fileTable, idColumn);
+        psStringAppend(pQuery, ", %s.data_state = 'update'", fileTable);
+        psStringAppend(&fileWhere, "AND %s.data_state = 'cleaned'", fileTable);
+    }
 
     psString whereClause =  psDBGenerateWhereSQL(where, NULL);
     psStringAppend(pQuery, " %s", whereClause);
     psFree(whereClause);
-
-    if (!p_psDBRunQuery(config->dbh, *pQuery)) {
+    if (fileWhere) {
+        psStringAppend(pQuery, "%s", fileWhere);
+    }
+
+    bool mdok;                          // Status of MD lookup
+    if (psMetadataLookupBool(&mdok, config->args, "-pretend")) {
+        psLogMsg("pxtools", PS_LOG_INFO, "Query to run: %s\n", *pQuery);
+        return true;
+    }
+
+    if (!p_psDBRunQueryF(config->dbh, *pQuery, joinHook)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;