[OFBiz] SVN: r6613 - in trunk/framework: entity/src/org/ofbiz/entity/util entityext/src/org/ofbiz/entityext/data

[jaz@svn.ofbiz.org]

Author: jaz
Date: 2006-01-30 11:43:03 -0600 (Mon, 30 Jan 2006)
New Revision: 6613

Modified:
   trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java
   trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
Log:
added maintain TX timestamp flag to command line loader


Modified: trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java
===================================================================
--- trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java	2006-01-30 05:15:31 UTC (rev 6612)
+++ trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java	2006-01-30 17:43:03 UTC (rev 6613)
@@ -33,6 +33,8 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
+import org.w3c.dom.Element;
+
 import org.ofbiz.base.component.ComponentConfig;
 import org.ofbiz.base.config.GenericConfigException;
 import org.ofbiz.base.config.MainResourceHandler;
@@ -48,7 +50,6 @@
 import org.ofbiz.entity.model.ModelReader;
 import org.ofbiz.entity.model.ModelUtil;
 import org.ofbiz.entity.model.ModelViewEntity;
-import org.w3c.dom.Element;
 
 /**
  * Some utility routines for loading seed data.
@@ -191,10 +192,10 @@
     }
 
     public static int loadData(URL dataUrl, String helperName, GenericDelegator delegator, List errorMessages, int txTimeout) throws GenericEntityException {
-        return loadData(dataUrl, helperName, delegator, errorMessages, txTimeout, false);
+        return loadData(dataUrl, helperName, delegator, errorMessages, txTimeout, false, false);
     }
 
-    public static int loadData(URL dataUrl, String helperName, GenericDelegator delegator, List errorMessages, int txTimeout, boolean dummyFks) throws GenericEntityException {
+    public static int loadData(URL dataUrl, String helperName, GenericDelegator delegator, List errorMessages, int txTimeout, boolean dummyFks, boolean maintainTxs) throws GenericEntityException {
         int rowsChanged = 0;
         
         if (dataUrl == null) {
@@ -220,6 +221,7 @@
                 reader = new EntitySaxReader(delegator);
             }
             reader.setCreateDummyFks(dummyFks);
+            reader.setMaintainTxStamps(maintainTxs);
             rowsChanged += reader.parse(dataUrl);
         } catch (Exception e) {
             String xmlError = "[install.loadData]: Error loading XML Resource \"" + dataUrl.toExternalForm() + "\"; Error was: " + e.getMessage();

Modified: trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
===================================================================
--- trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java	2006-01-30 05:15:31 UTC (rev 6612)
+++ trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java	2006-01-30 17:43:03 UTC (rev 6613)
@@ -64,6 +64,7 @@
     protected String directory = null;
     protected String file = null;
     protected boolean useDummyFks = false;
+    protected boolean maintainTxs = false;
     protected int txTimeout = -1;
 
     public EntityDataLoadContainer() {
@@ -128,6 +129,8 @@
                         this.directory = argumentVal;
                     } else if ("createfks".equalsIgnoreCase(argumentName)) {
                         this.useDummyFks = "true".equalsIgnoreCase(argumentVal);
+                    } else if ("maintainTxs".equalsIgnoreCase(argumentName)) {
+                        this.maintainTxs = "true".equalsIgnoreCase(argumentVal);
                     }
                 }
     
@@ -247,7 +250,7 @@
             while (urlIter.hasNext()) {
                 URL dataUrl = (URL) urlIter.next();
                 try {
-                    int rowsChanged = EntityDataLoader.loadData(dataUrl, helperName, delegator, errorMessages, txTimeout, useDummyFks);
+                    int rowsChanged = EntityDataLoader.loadData(dataUrl, helperName, delegator, errorMessages, txTimeout, useDummyFks, maintainTxs);
                     totalRowsChanged += rowsChanged;
                     infoMessages.add(changedFormat.format(rowsChanged) + " of " + changedFormat.format(totalRowsChanged) + " from " + dataUrl.toExternalForm());
                 } catch (GenericEntityException e) {