Changeset 27518 for trunk/ippTools/src/magicdstool.c

Timestamp:

Mar 29, 2010, 4:00:36 PM (16 years ago)

Author:

Paul Price

Message:

Fix destreaking bug: magicdstool -getskycells assumed the mapping between skycells and chips is identical for both the inputs to a diff. Broke the query out into separate cases.

File:

• trunk/ippTools/src/magicdstool.c (modified) (2 diffs)

trunk/ippTools/src/magicdstool.c

@@ -1135 +1135 @@
 
     psMetadata *where = psMetadataAlloc();
+    PXOPT_COPY_S64(config->args, where, "-magic_ds_id", "magicDSRun.magic_ds_id", "==");
     PXOPT_COPY_STR(config->args, where, "-class_id",    "warpSkyCellMap.class_id", "==");
     PXOPT_COPY_STR(config->args, where, "-skycell_id",  "warpSkyCellMap.skycell_id", "==");
@@ -1146 +1147 @@
     }
 
+    psString whereClause = NULL;
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " AND %s", whereClause);
-        psFree(whereClause);
+        whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringPrepend(&whereClause, "\n");
     }
     psFree(where);
 
-    if (!p_psDBRunQueryF(config->dbh, query, magic_ds_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, whereClause, whereClause)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);