Changeset 28743

Timestamp:

Jul 28, 2010, 2:23:10 PM (16 years ago)

Author:

bills

Message:

in -updatewarp don't need to join to warpBackgroundSkyfile pxUpdateRun will handle that if necessary
Fix typo in warpBackgroundSkyfile table name

Location:

trunk/ippTools

Files:

• share/bgtool_warp.sql (modified) (1 diff)
• src/bgtool.c (modified) (2 diffs)
• src/bgtoolConfig.c (modified) (1 diff)

trunk/ippTools/share/bgtool_warp.sql

@@ -13 +13 @@
     rawExp.exp_time
 FROM warpBackgroundRun
-JOIN warpBackgroundImfile USING(warp_bg_id)
+JOIN warpBackgroundSkyfile USING(warp_bg_id)
 JOIN warpRun USING(warp_id)
 JOIN fakeRun USING(fake_id)

trunk/ippTools/src/bgtool.c

@@ -69 +69 @@
 static const tableData warpTables[] = {
     { "warpBackgroundRun", (void*)&warpBackgroundRunObjectFromMetadata, &warpBackgroundRunInsertObject },
-    { "warpBackgroundImfile", (void*)&warpBackgroundSkyfileObjectFromMetadata, &warpBackgroundSkyfileInsertObject },
+    { "warpBackgroundSkyfile", (void*)&warpBackgroundSkyfileObjectFromMetadata, &warpBackgroundSkyfileInsertObject },
     { NULL, NULL, NULL }
 };
@@ -1260 +1260 @@
     }
 
-    psString query = psStringCopy("UPDATE warpBackgroundRun JOIN warpBackgroundSkyfile USING(warp_bg_id)");
+    psString query = psStringCopy("UPDATE warpBackgroundRun");
     bool result = pxUpdateRun(config, where, &query, "warpBackgroundRun", "warp_bg_id",
                               "warpBackgroundSkyfile", true);

trunk/ippTools/src/bgtoolConfig.c

@@ -328 +328 @@
     psMetadataAddStr(warpArgs, PS_LIST_TAIL, "-dist_group", PS_META_DUPLICATE_OK, "search by dist_group", NULL);
     pxmagicAddArguments(warpArgs);
+    pxspaceAddArguments(warpArgs);
     psMetadataAddBool(warpArgs, PS_LIST_TAIL, "-all", 0, "search without arguments", false);
     psMetadataAddU64(warpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);