Changeset 21308 for trunk/ippTools/src/warptool.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/warptool.c (modified) (6 diffs)

trunk/ippTools/src/warptool.c

@@ -681 +681 @@
 {
     unsigned int nFail = 0;
+    psMetadata *imfiles = psMetadataAlloc();
     psMetadata *skycells = psMetadataConfigRead(NULL, &nFail, mapfile, false);
     if (!skycells) {
@@ -689 +690 @@
         psError(PS_ERR_UNKNOWN, false, "there were %d errors parsing mapfile: %s", nFail, mapfile);
         psFree(skycells);
+        psFree(imfiles);
         return false;
     }
@@ -699 +701 @@
             psFree(iter);
             psFree(skycells);
+            psFree(imfiles);
             return false;
         }
@@ -710 +713 @@
             psFree(iter);
             psFree(skycells);
-            return false;
-        }
+            psFree(imfiles);
+            return false;
+        }
+        psMetadataAddS64(imfiles, PS_LIST_TAIL, row->skycell_id, PS_META_REPLACE, "", row->warp_id);
 
         if (!warpSkyCellMapInsertObject(config->dbh, row)) {
@@ -726 +731 @@
             psFree(iter);
             psFree(skycells);
+            psFree(imfiles);
             return false;
         }
 
         psFree(row);
+    }
+    psFree(iter);
+
+    // create warp_skyfile_ids for the output skyfiles
+    psString query = "INSERT INTO warpImfile VALUES(%" PRId64 ", '%s', 0)";
+    iter = psMetadataIteratorAlloc(imfiles, 0, NULL);
+    while ((item = psMetadataGetAndIncrement(iter))) {
+        psString skycell_id = item->name;
+        psS64 warp_id = item->data.S64;
+
+        if (!p_psDBRunQuery(config->dbh, query, warp_id, skycell_id)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return false;
+        }
     }
     psFree(iter);
     psFree(skycells);
+    psFree(imfiles);
 
     return true;
@@ -940 +961 @@
                            !accept,
                            code,
-                           0,           // warp_image_id
                            0            // magic_ds_id
         )) {