Changeset 12184

Timestamp:

Mar 2, 2007, 11:19:58 AM (19 years ago)

Author:

jhoblitt

Message:

tidy up chiptool -queuerawexp

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/chiptool_find_rawexp.sql (added)
• src/chiptool.c (modified) (4 diffs)

trunk/ippTools/share/Makefile.am

@@ -12 +12 @@
         chiptool_queuerawexp.sql \
         chiptool_queuerawimfile.sql
+        chiptool_find_rawexp.sql 

trunk/ippTools/src/chiptool.c

@@ -184 +184 @@
 
     // find the exp_tag of all the exposures that we want to queue up.
-    psString query = psStringCopy(
-            "SELECT exp_tag FROM rawExp WHERE rawExp.fault = 0");
+    psString query = pxDataGet("chiptool_find_rawexp.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
     if (where) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp");
@@ -211 +215 @@
     }
 
-    // load the SQL to enqueue our exp_tags from disk once
-    psString queuerawexp_query = pxDataGet("chiptool_queuerawexp.sql");
-    if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
-        psFree(output);
-        return false;
-    }
-
-    psString queuerawimfile_query = pxDataGet("chiptool_queuerawimfile.sql");
-    if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
-        psFree(queuerawexp_query);
-        psFree(output);
-        return false;
-    }
-
     // start a transaction so we don't end up with an exp without any associted
     // imfiles
     if (!psDBTransaction(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
-        psFree(queuerawimfile_query);
-        psFree(queuerawexp_query);
         psFree(output);
         return false;
@@ -244 +230 @@
         if (!status) {
             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for exp_tag");
-            psFree(queuerawimfile_query);
-            psFree(queuerawexp_query);
             psFree(output);
             return false;
@@ -257 +241 @@
             psError(PS_ERR_UNKNOWN, false,
                     "failed to trying to queue exp_tag: %s", exp_tag);
-            psFree(queuerawimfile_query);
-            psFree(queuerawexp_query);
-            psFree(output);
-            return false;
-        }
-    }
-    psFree(queuerawimfile_query);
-    psFree(queuerawexp_query);
+            psFree(output);
+            return false;
+        }
+    }
     psFree(output);