Changeset 16828

Timestamp:

Mar 5, 2008, 11:07:22 AM (18 years ago)

Author:

Paul Price

Message:

No warpInputExp any more.

Location:

trunk/ippTools

Files:

• share/difftool_inputskyfile.sql (modified) (2 diffs)
• share/stacktool_inputskyfile.sql (modified) (1 diff)
• src/warptool.c (modified) (8 diffs)

trunk/ippTools/share/difftool_inputskyfile.sql

@@ -17 +17 @@
         AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id
         AND diffInputSkyfile.tess_id    = warpSkyfile.tess_id
-    JOIN warpInputExp
-        ON diffInputSkyfile.warp_id = warpInputExp.warp_id
+    JOIN warpRun
+        ON diffInputSkyfile.warp_id = warpRun.warp_id
     JOIN camProcessedExp
-        ON warpInputExp.cam_id = camProcessedExp.cam_id
+        ON warpRun.cam_id = camProcessedExp.cam_id
     JOIN chipRun
         ON camProcessedExp.chip_id = chipRun.chip_id
@@ -47 +47 @@
     JOIN stackInputSkyfile
         ON diffInputSkyfile.stack_id = stackInputSkyfile.stack_id
-    JOIN warpInputExp
-        ON stackInputSkyfile.warp_id = warpInputExp.warp_id
+    JOIN warpRun
+        ON stackInputSkyfile.warp_id = warpRun.warp_id
     JOIN camProcessedExp
-        ON warpInputExp.cam_id = camProcessedExp.cam_id
+        ON warpRun.cam_id = camProcessedExp.cam_id
     JOIN chipRun
         ON camProcessedExp.chip_id = chipRun.chip_id

trunk/ippTools/share/stacktool_inputskyfile.sql

@@ -9 +9 @@
     AND stackRun.skycell_id       = warpSkyfile.skycell_id
     AND stackRun.tess_id          = warpSkyfile.tess_id
-JOIN warpInputExp
-    ON stackInputSkyfile.warp_id = warpInputExp.warp_id
+JOIN warpRun
+    ON stackInputSkyfile.warp_id = warpRun.warp_id
 JOIN camProcessedExp
-    ON warpInputExp.cam_id = camProcessedExp.cam_id
+    ON warpRun.cam_id = camProcessedExp.cam_id
 JOIN chipRun
     ON camProcessedExp.chip_id = chipRun.chip_id

trunk/ippTools/src/warptool.c

@@ -193 +193 @@
 
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpInputExp");
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpRun");
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -240 +240 @@
 
         // negative simple so the default is true
-        if (!ippdbPrintMetadatas(stdout, output, "warpInputExp", !simple)) {
+        if (!ippdbPrintMetadatas(stdout, output, "warpRun", !simple)) {
             psError(PS_ERR_UNKNOWN, false, "failed to print array");
             psFree(output);
@@ -268 +268 @@
 
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpInputExp");
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpRun");
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -343 +343 @@
 
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpInputExp");
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpRun");
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -390 +390 @@
 
         // negative simple so the default is true
-        if (!ippdbPrintMetadatas(stdout, output, "warpInputExp", !simple)) {
+        if (!ippdbPrintMetadatas(stdout, output, "warpRun", !simple)) {
             psError(PS_ERR_UNKNOWN, false, "failed to print array");
             psFree(output);
@@ -402 +402 @@
 }
 
-    
+
 static bool addoverlapMode(pxConfig *config)
 {
@@ -673 +673 @@
     // XXX need to validate that this coresponds to an warpInputImfile
     if (!warpSkyfileInsert(config->dbh,
-                           (psS64)atoll(warp_id),
-                           skycell_id,
-                           tess_id,
-                           uri,
-                           path_base,
-                           bg,
-                           bg_stdev,
-                           dtime_warp,
-                           hostname,
-                           good_frac,
-                           ignore,
-                           code
+                           (psS64)atoll(warp_id),
+                           skycell_id,
+                           tess_id,
+                           uri,
+                           path_base,
+                           bg,
+                           bg_stdev,
+                           dtime_warp,
+                           hostname,
+                           good_frac,
+                           ignore,
+                           code
         )) {
         if (!psDBRollback(config->dbh)) {
@@ -717 +717 @@
     // < 5 & MYSQL 5 versions need to be kept in sync
 
-#undef MYSQL5 
+#undef MYSQL5
 #if MYSQL5
     // XXX at MySQL 4.1.21 (probably all of 4.1.x) chokes and dies on this