From bad9d34a09ef500b2acb666db0e8c38e3d1a8ea2 Mon Sep 17 00:00:00 2001
From: Thorsten Vitt <thorsten.vitt@uni-wuerzburg.de>
Date: Mon, 11 Sep 2017 17:42:09 +0200
Subject: [PATCH] ZIP: Streaming mode is default
---
src/main/java/info/textgrid/services/aggregator/REST.java | 5 ++---
.../info/textgrid/services/aggregator/zip/ZipResult.java | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/info/textgrid/services/aggregator/REST.java b/src/main/java/info/textgrid/services/aggregator/REST.java
index e5dfefb..1143718 100644
--- a/src/main/java/info/textgrid/services/aggregator/REST.java
+++ b/src/main/java/info/textgrid/services/aggregator/REST.java
@@ -185,7 +185,7 @@ public Response getZIP(
@QueryParam("target") @Description("if query is used, the query target (metadata, fulltext or both)") @DefaultValue("both") final String target,
@QueryParam("start") @Description("for query: start at result no.") @DefaultValue("0") int start,
@QueryParam("stop") @Description("for query: max. number of results") @DefaultValue("65535") int stop,
- @QueryParam("stream") @Description("if true, favor fast results over ideal rewriting") @DefaultValue("false") boolean stream,
+ @QueryParam("stream") @Description("if true, favor fast results over ideal rewriting") @DefaultValue("true") boolean stream,
@Description("Also access sandboxed data") @QueryParam("sandbox") final boolean sandbox,
@Context final Request request) throws MetadataParseFault,
ObjectNotFoundFault, IoFault, AuthFault,
@@ -201,8 +201,7 @@ public Response getZIP(
zipResult.sid(sid);
if (query != null)
zipResult.initFromSearch(query, target, start, stop, filter);
- if (stream)
- zipResult.streaming(stream);
+ zipResult.streaming(stream);
return zipResult.createResponse().build();
}
diff --git a/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java b/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
index d9ed9aa..1e06756 100644
--- a/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
+++ b/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
@@ -116,7 +116,7 @@ protected void walkAggregation(ObjectType aggregation, boolean again) {
private boolean includeMeta;
private StylesheetManager stylesheetManager;
private Optional<Transformation> transformation = Optional.absent();
- private boolean streamingMode = false;
+ private boolean streamingMode = true;
public ZipResult streaming(final boolean streamingMode) {
this.streamingMode = streamingMode;
@@ -206,7 +206,7 @@ public void write(final OutputStream output) throws IOException,
try {
final Iterable<ObjectType> rootObjects = getRootObjects();
logger.log(Level.INFO, MessageFormat.format(
- "Starting ZIP export after {0}", stopwatch));
+ "Starting {1} ZIP export after {0}", stopwatch, streamingMode? "streaming" : "fully link rewriting"));
zip.setComment("# Exported from TextGrid -- www.textgrid.de");
mapping = new ImportMapping();
--
GitLab