From 5705d31c1e074b3c00c26d96a090718da2b1a9a1 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 21 Jun 2023 06:58:29 +0200 Subject: [PATCH] Add display column in ODK CSV queries --- .../argeo/app/servlet/odk/OdkManifestServlet.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java index 36e8770..6e145c2 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java @@ -136,7 +136,13 @@ public class OdkManifestServlet extends HttpServlet { if (target.isNodeType(NodeType.NT_QUERY)) { Query query = target.getSession().getWorkspace().getQueryManager().getQuery(target); QueryResult queryResult = query.execute(); - String[] columnNames = queryResult.getColumnNames(); + List columnNames = new ArrayList<>(); + for (String c : queryResult.getColumnNames()) { + columnNames.add(c); + } + // TODO make it more configurable + columnNames.add("display"); + if (EntityMimeType.XML.equals(mimeType)) { } else if (EntityMimeType.CSV.equals(mimeType)) { CsvWriter csvWriter = new CsvWriter(out, charset); @@ -150,12 +156,14 @@ public class OdkManifestServlet extends HttpServlet { for (Value value : values) { lst.add(value.getString()); } + // display + lst.add(row.getValue("name").getString() + " (" + row.getValue("label").getString() + ")"); csvWriter.writeLine(lst); } } else { // corner case of an empty initial database List lst = new ArrayList<>(); - for (int i = 0; i < columnNames.length; i++) + for (int i = 0; i < columnNames.size(); i++) lst.add("-"); csvWriter.writeLine(lst); } -- 2.30.2