Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/server/MapPrintServiceImpl.java @ 5677:413798463dfe
Do ordering in the data dictionary and replace "null" strings with empty strings
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 12 Apr 2013 12:58:46 +0200 |
| parents | f8409fbe3b88 |
| children | c4162d8378a1 |
comparison
equal
deleted
inserted
replaced
| 5676:f8409fbe3b88 | 5677:413798463dfe |
|---|---|
| 264 // Retrieve print settings from request | 264 // Retrieve print settings from request |
| 265 Map<String, Object> pageSpecs = new HashMap<String, Object>(); | 265 Map<String, Object> pageSpecs = new HashMap<String, Object>(); |
| 266 Map<String, Object> data = new HashMap<String, Object>(); | 266 Map<String, Object> data = new HashMap<String, Object>(); |
| 267 List<Object> payload = new ArrayList<Object>(); | 267 List<Object> payload = new ArrayList<Object>(); |
| 268 data.put("data", payload); | 268 data.put("data", payload); |
| 269 Enumeration<String> paramNames = req.getParameterNames(); | 269 Enumeration paramNames = req.getParameterNames(); |
| 270 while (paramNames.hasMoreElements()) { | 270 List<String> params = Collections.list(paramNames); |
| 271 String paramName = paramNames.nextElement(); | 271 Collections.sort(params); |
| 272 if (paramName.startsWith("mapfish-data-")) { | 272 for (String paramName : params) { |
| 273 // You can add mapfish-data variables that will be mapped | 273 if (paramName.startsWith("mapfish_data_")) { |
| 274 // You can add mapfish_data variables that will be mapped | |
| 274 // to a info value pairs to provide meta data for the map | 275 // to a info value pairs to provide meta data for the map |
| 276 // The the info part starts with a number for sorting that | |
| 277 // number will be stripped | |
| 275 String paramValue = req.getParameter(paramName); | 278 String paramValue = req.getParameter(paramName); |
| 276 if (paramValue != null && !paramValue.isEmpty()) { | 279 Map<String, Object> data3 = new HashMap<String, Object>(); |
| 277 Map<String, Object> data3 = new HashMap<String, Object>(); | 280 int order = 0; |
| 281 try { | |
| 282 order = Integer.parseInt(paramName.substring(13, 14)); | |
| 283 data3.put("info", paramName.substring(14)); | |
| 284 } catch (NumberFormatException nfe) { | |
| 278 data3.put("info", paramName.substring(13)); | 285 data3.put("info", paramName.substring(13)); |
| 279 data3.put("value", paramValue); | |
| 280 payload.add(data3); | 286 payload.add(data3); |
| 281 } | 287 } |
| 282 } else if (paramName.startsWith("mapfish-")) { | 288 if (paramValue.equals("null")) |
| 289 data3.put("value", ""); | |
| 290 else | |
| 291 data3.put("value", paramValue); | |
| 292 payload.add(data3); | |
| 293 } else if (paramName.startsWith("mapfish_")) { | |
| 283 String paramValue = req.getParameter(paramName); | 294 String paramValue = req.getParameter(paramName); |
| 295 if (paramValue.equals("null") | |
| 296 paramValue = ""; | |
| 284 pageSpecs.put(paramName.substring(8), paramValue); | 297 pageSpecs.put(paramName.substring(8), paramValue); |
| 285 } | 298 } |
| 286 } | 299 } |
| 287 if (!payload.isEmpty()) { | 300 if (!payload.isEmpty()) { |
| 288 pageSpecs.put("data", data); | 301 pageSpecs.put("data", data); |