diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java b/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java index bdc2031a..572a2cce 100644 --- a/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java @@ -39,6 +39,7 @@ import java.io.IOException; public class ExportController extends BaseMultiActionController { private static final String IMG_EXPORT_FORMAT = "IMG_EXPORT_FORMAT"; private static final String MAP_ID_PARAMETER = "mapId"; + private static final String MAP_SVG_PARAMETER = "mapSvg"; private static final String EXPORT_FORMAT_PARAMETER = "exportFormat"; private static final String IMG_SIZE_PARAMETER = "imgSize"; @@ -58,6 +59,8 @@ public class ExportController extends BaseMultiActionController { int mindmapId = Integer.parseInt(mapIdStr); + final String mapSvg = request.getParameter(MAP_SVG_PARAMETER); + String formatStr = request.getParameter(EXPORT_FORMAT_PARAMETER); if (IMG_EXPORT_FORMAT.endsWith(formatStr)) { formatStr = request.getParameter("imgFormat"); @@ -93,7 +96,7 @@ public class ExportController extends BaseMultiActionController { // Write content ... final ServletOutputStream outputStream = response.getOutputStream(); - mindMap.export(properties, outputStream); + mindMap.export(properties, outputStream, mapSvg); } catch (Throwable e) { @@ -136,6 +139,8 @@ public class ExportController extends BaseMultiActionController { logger.info("Export Controller: generating image WiseMap action"); final String mapIdStr = request.getParameter(MAP_ID_PARAMETER); + final String mapSvg = request.getParameter(MAP_SVG_PARAMETER); + int mindmapId = Integer.parseInt(mapIdStr); final MindmapService service = getMindmapService(); final MindMap mindMap = service.getMindmapById(mindmapId); @@ -155,7 +160,7 @@ public class ExportController extends BaseMultiActionController { // Write content ... final ServletOutputStream outputStream = response.getOutputStream(); - mindMap.export(imageProperties, outputStream); + mindMap.export(imageProperties, outputStream, mapSvg); } catch (Throwable e) { diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java index d3b861d9..c97caaab 100644 --- a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java @@ -55,8 +55,10 @@ public class MindmapManagerImpl hibernateCriteria.add(Restrictions.eq("mindmapId",mindmapId)); hibernateCriteria.addOrder( Order.desc("creationTime")); // Mientras no haya paginacion solo los 10 primeros - hibernateCriteria.setMaxResults(10); - return hibernateCriteria.list(); + // This line throws errors in some environments, so getting all history and taking firsts 10 records + // hibernateCriteria.setMaxResults(10); + List list = hibernateCriteria.list(); + return list.subList(0,(10 +