Changeset 17226 for trunk/ippTools/src/chiptool.c

Timestamp:

Mar 28, 2008, 5:00:10 PM (18 years ago)

Author:

jhoblitt

Message:

implement warptool -revertwarped query support

File:

• trunk/ippTools/src/chiptool.c (modified) (6 diffs)

trunk/ippTools/src/chiptool.c

@@ -154 +154 @@
         && !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
-        where = NULL;
         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
         return false;
@@ -175 +174 @@
     if (!query) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psFree(where);
         return false;
     }
@@ -180 +180 @@
     if (where && psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp");
-        psFree(where);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
     }
+
+    psFree(where);
 
     if (pretend) {
@@ -712 +713 @@
         && !psMetadataLookupBool(NULL, config->args, "-all")) {
         psFree(where);
-        where = NULL;
         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
         return false;
@@ -720 +720 @@
     if (!query) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psFree(where);
         return false;
     }
@@ -725 +726 @@
     if (where && psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, "chipProcessedImfile");
-        psFree(where);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
     }
+
+    psFree(where);
 
     if (!p_psDBRunQuery(config->dbh, query)) {