X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.servlet.odk%2Fsrc%2Forg%2Fargeo%2Fapp%2Fservlet%2Fodk%2FOdkManifestServlet.java;h=e5e2de6ebce277a157341a023da1472a8b675695;hb=616a062e9d061ce91589556624ed622298a21ac7;hp=36e8770bba6fa929feb8bceeaabbb3daf3dd5eee;hpb=2e895e3a6f06f18642851b72d90fd72391e4a81a;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..e5e2de6 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
@@ -29,7 +29,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.output.NullOutputStream;
-import org.argeo.app.api.EntityMimeType;
+import org.argeo.api.app.EntityMimeType;
+import org.argeo.api.app.EntityType;
+import org.argeo.api.app.WGS84PosName;
+import org.argeo.app.geo.GeoShapeUtils;
 import org.argeo.app.odk.OrxManifestName;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
@@ -136,7 +139,14 @@ 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");
+			columnNames.add("geometry");
+
 			if (EntityMimeType.XML.equals(mimeType)) {
 			} else if (EntityMimeType.CSV.equals(mimeType)) {
 				CsvWriter csvWriter = new CsvWriter(out, charset);
@@ -150,12 +160,24 @@ public class OdkManifestServlet extends HttpServlet {
 						for (Value value : values) {
 							lst.add(value.getString());
 						}
+						// display
+						lst.add(row.getValue("name").getString() + " (" + row.getValue("label").getString() + ")");
+						Node field = row.getNode("geopoint");
+						if (field != null && field.isNodeType(EntityType.geopoint.get())) {
+							double lat = field.getProperty(WGS84PosName.lat.get()).getDouble();
+							double lon = field.getProperty(WGS84PosName.lon.get()).getDouble();
+							double alt = field.hasProperty(WGS84PosName.alt.get())
+									? field.getProperty(WGS84PosName.alt.get()).getDouble()
+									: Double.NaN;
+							String geoshape = GeoShapeUtils.geoPointToGeoShape(lon, lat, alt);
+							lst.add(geoshape);
+						}
 						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);
 				}