From ac8c76868aeb753b0df231cdc5003d31a22233ea Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Thu, 27 Mar 2014 18:53:32 +0100
Subject: [PATCH] [Minor] added more debugging when exporting

This is useful for long running exports
---
 .../command/XmlExportModelCommand.java        | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/li/strolch/command/XmlExportModelCommand.java b/src/main/java/li/strolch/command/XmlExportModelCommand.java
index 6dee62320..62f56ce49 100644
--- a/src/main/java/li/strolch/command/XmlExportModelCommand.java
+++ b/src/main/java/li/strolch/command/XmlExportModelCommand.java
@@ -24,6 +24,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
 
 import javanet.staxutils.IndentingXMLStreamWriter;
 
@@ -55,6 +56,7 @@ import ch.eitchnet.utils.dbc.DBC;
 public class XmlExportModelCommand extends Command {
 
 	public static final String XML_FILE_SUFFIX = ".xml";
+	private static final long LOG_INTERVAL = TimeUnit.SECONDS.toMillis(1);
 
 	// input
 	private File modelFile;
@@ -67,9 +69,12 @@ public class XmlExportModelCommand extends Command {
 	private XmlModelStatistics statistics;
 	private boolean multiFile;
 
+	private int elementsToWrite;
 	private int nrOfResourcesToExport;
 	private int nrOfOrdersToExport;
 
+	private long nextLogTime;
+
 	public XmlExportModelCommand(ComponentContainer container, StrolchTransaction tx) {
 		super(container, tx);
 	}
@@ -82,6 +87,7 @@ public class XmlExportModelCommand extends Command {
 
 	@Override
 	public void doCommand() {
+		this.nextLogTime = System.currentTimeMillis() + LOG_INTERVAL;
 		String fileName = this.modelFile.getName();
 
 		long start = System.nanoTime();
@@ -99,7 +105,6 @@ public class XmlExportModelCommand extends Command {
 			for (String type : resourceTypesToExport) {
 				nrOfResourcesToExport += resourceMap.querySize(tx(), type);
 			}
-			logger.info("Exporting " + nrOfResourcesToExport + " Resources...");
 		}
 
 		if (this.doOrders) {
@@ -111,10 +116,12 @@ public class XmlExportModelCommand extends Command {
 			for (String type : orderTypesToExport) {
 				nrOfOrdersToExport += orderMap.querySize(tx(), type);
 			}
-			logger.info("Exporting " + nrOfOrdersToExport + " Orders...");
 		}
 
-		logger.info("Exporting " + (nrOfResourcesToExport + nrOfOrdersToExport) + " Elements...");
+		this.elementsToWrite = nrOfResourcesToExport + nrOfOrdersToExport;
+		logger.info("Exporting " + elementsToWrite + " Elements...");
+		logger.info("Exporting " + nrOfResourcesToExport + " Resources...");
+		logger.info("Exporting " + nrOfOrdersToExport + " Orders...");
 
 		try (FileOutputStream out = new FileOutputStream(this.modelFile)) {
 			createdFiles.add(this.modelFile);
@@ -212,6 +219,14 @@ public class XmlExportModelCommand extends Command {
 			Order order = orderMap.getBy(tx(), type, id);
 			visitor.visit(order);
 			this.statistics.nrOfOrders++;
+			logElementsWritten();
+		}
+	}
+
+	private void logElementsWritten() {
+		if (this.nextLogTime < System.currentTimeMillis()) {
+			logger.info("Wrote " + this.statistics.getNrOfElements() + " of " + this.elementsToWrite + " Elements.");
+			this.nextLogTime = System.currentTimeMillis() + LOG_INTERVAL;
 		}
 	}
 
@@ -222,6 +237,7 @@ public class XmlExportModelCommand extends Command {
 			Resource resource = resourceMap.getBy(tx(), type, id);
 			visitor.visit(resource);
 			this.statistics.nrOfResources++;
+			logElementsWritten();
 		}
 	}