X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.servlet.odk%2Fsrc%2Forg%2Fargeo%2Fapp%2Fservlet%2Fodk%2FOdkManifestServlet.java;fp=org.argeo.app.servlet.odk%2Fsrc%2Forg%2Fargeo%2Fapp%2Fservlet%2Fodk%2FOdkManifestServlet.java;h=6e145c2b951fb0f87013e3887b29258a181973e9;hb=5705d31c1e074b3c00c26d96a090718da2b1a9a1;hp=36e8770bba6fa929feb8bceeaabbb3daf3dd5eee;hpb=5b19818c49cd2231900cd4cbccd86bd8b20ecadd;p=gpl%2Fargeo-suite.git

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<String> 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<String> lst = new ArrayList<>();
-					for (int i = 0; i < columnNames.length; i++)
+					for (int i = 0; i < columnNames.size(); i++)
 						lst.add("-");
 					csvWriter.writeLine(lst);
 				}