Changeset 28202

Timestamp:

Jun 3, 2010, 11:46:24 AM (16 years ago)

Author:

bills

Message:

Fix problem reported in ticket 1390. Disallow -updaterun -set_state update and print out
a suggestion on what to do.

Location:

trunk/ippTools/src

Files:

• pxtools.c (modified) (1 diff)
• warptool.c (modified) (1 diff)

trunk/ippTools/src/pxtools.c

@@ -289 +289 @@
     PXOPT_LOOKUP_STR(note, config->args,        "-set_note", false, false);
 
+    if (!strcmp(state, "update")) {
+        fprintf(stderr, "'-updaterun -set_state update' is not supported.");
+        if (!strcmp(runTable, "chipRun")) {
+            fprintf(stderr, " Use -setimfiletoupdate.\n");
+        } else {
+            fprintf(stderr, " Use -setskyfiletoupdate.\n");
+        }
+        exit(1);
+    }
+
     psString dist_group = NULL;
     if (has_dist_group) {

trunk/ippTools/src/warptool.c

@@ -426 +426 @@
     }
 
-    psString query = psStringCopy("UPDATE warpRun JOIN warpSkyfile USING(warp_id) JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id)");
+    psString query = psStringCopy("UPDATE warpRun");
 
     // pxUpdateRun gets parameters from config->args and updates