Changeset 17789 for trunk/ippTools/src

Timestamp:

May 23, 2008, 3:36:44 PM (18 years ago)

Author:

Paul Price

Message:

Adding option of faulting on generating warp overlaps.

Location:

trunk/ippTools/src

Files:

• warptool.c (modified) (2 diffs)
• warptoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/warptool.c

@@ -525 +525 @@
 
     PXOPT_LOOKUP_STR(mapfile, config->args, "-mapfile", false, false);
+    PXOPT_LOOKUP_STR(warp_id, config->args, "-warp_id", false, false);
+    PXOPT_LOOKUP_STR(cam_id, config->args, "-cam_id", false, false);
+    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
 
     if (!psDBTransaction(config->dbh)) {
@@ -531 +534 @@
     }
 
-    if (!parseAndInsertSkyCellMap(config, mapfile)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to inject mapfile: %s into the database", mapfile);
-        // rollback
-        if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        return false;
+    if (code == 0) {
+        if (!parseAndInsertSkyCellMap(config, mapfile)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to inject mapfile: %s into the database", mapfile);
+            // rollback
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return false;
+        }
+    } else {
+        warpSkyCellMapInsert(config->dbh, (psS64)atoll(warp_id), NULL, NULL,
+                             (psS64)atoll(cam_id), NULL, code);
     }
 

trunk/ippTools/src/warptoolConfig.c

@@ -207 +207 @@
     psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0,
             "path to skycell <-> imfile mapping file", NULL);
+    psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-warp_id",  0,
+            "set warp ID", NULL);
+    psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-cam_id",  0,
+            "set cam ID", NULL);
+    psMetadataAddS16(addoverlapArgs, PS_LIST_TAIL, "-code",  0,
+            "set fault code", 0);
 
     // -scmap
@@ -213 +219 @@
             "search by warptool ID", NULL);
     psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0,
-            "searcy by skycell ID", NULL);
+            "search by skycell ID", NULL);
     psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-tess_id", 0,
-            "searcy by tess ID", NULL);
+            "search by tess ID", NULL);
     psMetadataAddU64(scmapArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);