Changeset 21308 for trunk/ippTools/src/chiptool.c

Timestamp:

Feb 5, 2009, 9:35:41 AM (17 years ago)

Author:

bills

Message:

Changed the way image ids are handled. For chip and warp new tables are
added the sole purpose of which are to create the image ids before
the images are created. For diff the id is added to diffInputSkyfile

File:

• trunk/ippTools/src/chiptool.c (modified) (3 diffs)

trunk/ippTools/src/chiptool.c

@@ -485 +485 @@
                                    path_base,
                                    code,
-                                   0,   // chip_image_id
                                    0    // magic_ds_id
             )) {
@@ -530 +529 @@
     pxchipGetSearchArgs (config, where); // chipRun, chipProcessedImfile, rawExp
     PXOPT_COPY_S64(config->args, where, "-chip_id", "chipRun.chip_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-chip_imfile_id", "chipImfile.chip_imfile_id", "==");
     PXOPT_COPY_STR(config->args, where, "-class_id", "chipProcessedImfile.class_id", "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "chipRun.reduction", "==");
@@ -542 +542 @@
     if (where && psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " AND %s", whereClause);
+        psStringAppend(&query, " WHERE %s", whereClause);
         psFree(whereClause);
     }