Changeset 27168

Timestamp:

Mar 3, 2010, 3:23:12 PM (16 years ago)

Author:

watersc1

Message:

Slight bug in the updatebyquery code, in which updating an exposure with a select by state would invalidate the update of the imfiles. The sql change helps avoid this issue.

Location:

trunk/ippTools

Files:

• share/regtool_pendingcompressimfile.sql (modified) (1 diff)
• src/regtool.c (modified) (3 diffs)

trunk/ippTools/share/regtool_pendingcompressimfile.sql

@@ -1 +1 @@
 SELECT rawImfile.*,rawExp.workdir,rawExp.exp_tag from rawImfile
        JOIN rawExp USING(exp_id)
-       WHERE (data_state = 'goto_compressed' OR data_state = 'goto_lossy')
+       WHERE ((data_state = 'goto_compressed' AND state = 'goto_compressed')
+           OR (data_state = 'goto_lossy' AND state = 'goto_lossy'))
 -- where hook %s
 -- limit hook %s       

trunk/ippTools/src/regtool.c

@@ -1356 +1356 @@
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
-  psString query = pxDataGet("regtool_updatebyquery.sql");
-  if (!query) {
-    psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
-    return(false);
-  }
   psString limitString = NULL;
   if (limit) {
@@ -1366 +1361 @@
     psStringPrepend(&limitString, "\n");
   }
+  // Update the imfiles first, because if you select by state, you'll clobber things
+  psString query = pxDataGet("regtool_updatebyqueryimfile.sql");
+  if (!query) {
+    psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+    return(false);
+  }
+
   //  printf(query,set_state,whereClause,limitString);
   if (!p_psDBRunQueryF(config->dbh, query, set_state, whereClause, limitString ? limitString : "")) {
@@ -1377 +1379 @@
 
   psFree(query);
-  // Now up date the imfiles.
-  query = pxDataGet("regtool_updatebyqueryimfile.sql");
+  // Now up date the exposure.
+  query = pxDataGet("regtool_updatebyquery.sql");  
   if (!query) {
     psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");