Changeset 23697

Timestamp:

Apr 3, 2009, 9:39:56 AM (17 years ago)

Author:

bills

Message:

did some work on the chip and warp exportrun modes

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (2 diffs)
• share/chiptool_export_imfile.sql (moved) (moved from trunk/ippTools/share/chiptool_export_imfiles.sql )
• share/chiptool_export_processed_imfile.sql (moved) (moved from trunk/ippTools/share/chiptool_export_processed_imfiles.sql )
• share/warptool_export_imfile.sql (added)
• share/warptool_export_run.sql (added)
• share/warptool_export_skycell_map.sql (added)
• share/warptool_export_skyfile.sql (added)
• src/chiptool.c (modified) (1 diff)
• src/warptool.c (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -22 +22 @@
      chiptool_run.sql \
      chiptool_export_run.sql \
-     chiptool_export_imfiles.sql \
-     chiptool_export_processed_imfiles.sql \
+     chiptool_export_imfile.sql \
+     chiptool_export_processed_imfile.sql \
      chiptool_unmasked.sql \
      detselect_search.sql \
@@ -177 +177 @@
      warptool_donecleanup.sql \
      warptool_exp.sql \
+     warptool_export_run.sql \
+     warptool_export_imfile.sql \
+     warptool_export_skyfile.sql \
+     warptool_export_skycell_map.sql \
      warptool_finished_run_select.sql \
      warptool_finish_run.sql \

trunk/ippTools/src/chiptool.c

@@ -1302 +1302 @@
   ExportTable tables [] = {
     {"chipRun", "chiptool_export_run.sql"},
-    {"chipImfile", "chiptool_export_imfiles.sql"},
-    {"chipProcessedImfile", "chiptool_export_processed_imfiles.sql"},
+    {"chipImfile", "chiptool_export_imfile.sql"},
+    {"chipProcessedImfile", "chiptool_export_processed_imfile.sql"},
   };
 

trunk/ippTools/src/warptool.c

@@ -1602 +1602 @@
       {"warpImfile", "warptool_export_imfile.sql"},
       {"warpSkyfile", "warptool_export_skyfile.sql"},
-      {"warpSkyCellMap", "warptool_export_sky_cell_map.sql"},
+      {"warpSkyCellMap", "warptool_export_skycell_map.sql"},
     };
 
-
-    for (int i=0; i < sizeof(tables); i++) {
+    int numTables = sizeof(tables)/sizeof(tables[0]);
+
+    for (int i=0; i < numTables; i++) {
       psString query = pxDataGet(tables[i].sqlFilename);
       if (!query) {