Changeset 12105

Timestamp:

Feb 27, 2007, 5:48:03 PM (19 years ago)

Author:

Paul Price

Message:

Need warp_id out.

File:

• trunk/ippTools/src/warptool.c (modified) (19 diffs)

trunk/ippTools/src/warptool.c

@@ -266 +266 @@
     // XXX instead of validiting it here we should just use forgein key
     // constrants
-    if (!warpInputExpInsert(config->dbh, 
+    if (!warpInputExpInsert(config->dbh,
             (psS32)atoi(warp_id),
             exp_tag,
@@ -292 +292 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy( 
+    psString query = psStringCopy(
         "SELECT\n"
         "   camProcessedExp.*\n"
@@ -302 +302 @@
         "   AND warpInputExp.cam_version = camProcessedExp.cam_version\n"
         " WHERE\n"
-        "   warpRun.state = 'run'\n" 
+        "   warpRun.state = 'run'\n"
         "   AND camProcessedExp.fault = 0\n"
     );
@@ -383 +383 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy( 
+    psString query = psStringCopy(
         "SELECT\n"
         "   rawImfile.*,\n"
@@ -393 +393 @@
         "   ON warpInputExp.exp_tag = rawImfile.exp_tag\n"
         " WHERE\n"
-        "   warpRun.state = 'run'\n" 
+        "   warpRun.state = 'run'\n"
     );
     if (config->where) {
@@ -472 +472 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy( 
+    psString query = psStringCopy(
         "SELECT\n"
+        "   warpRun.warp_id,\n"
         "   camProcessedExp.*,\n"
         "   rawExp.camera,\n"
@@ -490 +491 @@
         "   AND warpInputExp.cam_version = warpSkyCellMap.cam_version\n"
         " WHERE\n"
-        "   warpRun.state = 'run'\n" 
+        "   warpRun.state = 'run'\n"
         "   AND camProcessedExp.fault = 0\n"
         "   AND warpSkyCellMap.warp_id IS NULL\n"
@@ -608 +609 @@
         psError(PS_ERR_UNKNOWN, false, "failed to parse mapfile: %s", mapfile);
         return false;
-    }        
+    }
     if (nFail) {
         psError(PS_ERR_UNKNOWN, false, "there were %d errors parsing mapfile: %s", nFail, mapfile);
@@ -673 +674 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy( 
+    psString query = psStringCopy(
         "SELECT\n"
         "   warpSkyCellMap.*,\n"
@@ -684 +685 @@
         "   AND warpSkyCellMap.class_id = chipProcessedImfile.class_id\n"
         " WHERE\n"
-        "   warpRun.state = 'run'\n" 
+        "   warpRun.state = 'run'\n"
     );
 
@@ -764 +765 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy( 
+    psString query = psStringCopy(
         "SELECT\n"
         "   warpSkyCellMap.*,\n"
@@ -779 +780 @@
         "   AND warpSkyCellMap.tess_id = warpSkyfile.tess_id\n"
         " WHERE\n"
-        "   warpRun.state = 'run'\n" 
+        "   warpRun.state = 'run'\n"
         "   AND warpSkyfile.warp_id IS NULL\n"
         "   AND warpSkyfile.skycell_id IS NULL\n"
@@ -916 +917 @@
 
     // XXX need to validate that this coresponds to an warpInputImfile
-    if (!warpSkyfileInsert(config->dbh, 
+    if (!warpSkyfileInsert(config->dbh,
             (psS32)atoi(warp_id),
             skycell_id,
@@ -977 +978 @@
         "           USING(warp_id, skycell_id, tess_id)\n"
         "       WHERE\n"
-        "           warpRun.state = 'run'\n" 
+        "           warpRun.state = 'run'\n"
         "       GROUP BY\n"
-        "           warpRun.warp_id\n"  
+        "           warpRun.warp_id\n"
         "       HAVING\n"
         "       COUNT(warpSkyCellMap.warp_id) = COUNT(warpSkyfile.warp_id)\n"
@@ -999 +1000 @@
         return false;
     }
-}    
-
-{    
+}
+
+{
     char *query =
         "INSERT INTO finished\n"
@@ -1017 +1018 @@
         "       USING(warp_id, skycell_id, tess_id)\n"
         "   WHERE\n"
-        "       warpRun.state = 'run'\n" 
+        "       warpRun.state = 'run'\n"
         "   GROUP BY\n"
-        "       warpRun.warp_id\n"  
+        "       warpRun.warp_id\n"
         "   HAVING\n"
         "       COUNT(warpSkyCellMap.warp_id) = COUNT(warpSkyfile.warp_id)\n"
@@ -1030 +1031 @@
 }
 
-{    
+{
     char *query =
         "UPDATE warpRun\n"
@@ -1063 +1064 @@
 
     // find all rawImfiles matching the default query
-    psString query = psStringCopy( 
+    psString query = psStringCopy(
         "SELECT\n"
         "   warpSkyfile.*\n"
@@ -1070 +1071 @@
         "   USING(warp_id)\n"
         " WHERE\n"
-        "   warpRun.state = 'run'\n" 
+        "   warpRun.state = 'run'\n"
     );