Changeset 23742

Timestamp:

Apr 7, 2009, 5:51:21 PM (17 years ago)

Author:

bills

Message:

changes to get building of distribution bundles for
diff and stack stages

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (2 diffs)
• share/difftool_export_input_skyfile.sql (added)
• share/difftool_export_run.sql (added)
• share/difftool_export_skyfile.sql (added)
• share/disttool_toadvance.sql (modified) (1 diff)
• share/stacktool_export_input_skyfile.sql (added)
• share/stacktool_export_run.sql (added)
• share/stacktool_export_sum_skyfile.sql (added)
• src/disttool.c (modified) (1 diff)
• src/stacktool.c (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -82 +82 @@
      difftool_definewarpwarp_insert.sql \
      difftool_donecleanup.sql \
+     difftool_export_input_skyfile.sql \
+     difftool_export_run.sql \
+     difftool_export_skyfile.sql \
      difftool_inputskyfile.sql \
      difftool_pendingcleanuprun.sql \
@@ -170 +173 @@
      stacktool_definebyquery_test.sql \
      stacktool_donecleanup.sql \
+     stacktool_export_input_skyfile.sql \
+     stacktool_export_run.sql \
+     stacktool_export_sum_skyfile.sql \
      stacktool_find_complete_warps.sql \
      stacktool_inputskyfile.sql \

trunk/ippTools/share/disttool_toadvance.sql

@@ -126 +126 @@
 UNION
 -- diff stage
-SELECT DISTINCT
+SELECT
     distRun.dist_id,
     stage,
     stage_id,
     outroot,
-    label,
+    distRun.label,
     clean
     FROM distRun
     JOIN diffSkyfile
-        ON distRun.dist_id = diffSkyfile.diff_id
+        ON stage_id = diffSkyfile.diff_id
     LEFT JOIN distComponent
         ON distRun.dist_id = distComponent.dist_id

trunk/ippTools/src/disttool.c

@@ -96 +96 @@
     PXOPT_LOOKUP_S64(stage_id, config->args, "-stage_id",  true, false);
     PXOPT_LOOKUP_STR(outroot, config->args, "-outroot", true, false);
+    PXOPT_LOOKUP_S64(target_id, config->args, "-target_id",  true, false);
+
     // optional
-    PXOPT_LOOKUP_S64(target_id, config->args, "-target_id",  true, false);
     PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
     PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);

trunk/ippTools/src/stacktool.c

@@ -1253 +1253 @@
       return true;
     }
+      // we must write the export table in non-simple (true) format
+    if (!ippdbPrintMetadatas(f, output, tables[i].tableName, true)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print array");
+        psFree(output);
+        return false;
+    }
+
     psFree(output);
   }