[Swift-commit] r4788 - trunk/src/org/griphyn/vdl/karajan

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2011-07-06 20:33:24 -0500 (Wed, 06 Jul 2011)
New Revision: 4788

Modified:
   trunk/src/org/griphyn/vdl/karajan/Loader.java
Log:
actually there is an option for that in the swift config file, so revert back to that for controlling provenance info in the compiled kml

Modified: trunk/src/org/griphyn/vdl/karajan/Loader.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/Loader.java	2011-07-06 23:03:33 UTC (rev 4787)
+++ trunk/src/org/griphyn/vdl/karajan/Loader.java	2011-07-07 01:33:24 UTC (rev 4788)
@@ -77,7 +77,6 @@
     public static final String VDL_OPERATION_RUN = "run";
     public static final String VDL_OPERATION_TYPECHECK = "typecheck";
     public static final String VDL_OPERATION_DRYRUN = "dryrun";
-    public static final String ARG_PROVENANCE = "enable.provenance";
 
     public static String buildVersion;
 
@@ -130,7 +129,8 @@
         }
 
         try {
-            //Thread.sleep(20000);
+            boolean provenanceEnabled = VDL2Config.getConfig().getProvenanceLog();
+
             setupLogging(ap, projectName, runID);
             logger.debug("Max heap: " + Runtime.getRuntime().maxMemory());
             
@@ -145,7 +145,7 @@
 
             if (project.endsWith(".swift")) {
                 try {
-                    project = compile(project, ap.isPresent(ARG_RECOMPILE), ap.isPresent(ARG_PROVENANCE));
+                    project = compile(project, ap.isPresent(ARG_RECOMPILE), provenanceEnabled);
                 }
                 catch (ParsingException pe) {
                     // the compiler should have already logged useful
@@ -493,7 +493,6 @@
         ap.addFlag(ARG_MINIMAL_LOGGING, "Makes logging much more terse: " +
                  "reports warnings only");
         
-        ap.addFlag(ARG_PROVENANCE, "Enables provenance tracking.");
 
         Map desc = VDL2ConfigProperties.getPropertyDescriptions();
         Iterator i = desc.entrySet().iterator();