octoleo
/
plantuml-server
mirror of https://github.com/octoleo/plantuml-server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

add the same support to maps 

sendMap should work similar to sendDiagram w.r.t. diagram source selection
This commit is contained in:
HeinrichAD 2023-07-19 23:00:32 +02:00 committed by PlantUML
parent 5859c3b427
commit 608b58b3e0
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/net/sourceforge/plantuml/servlet/DiagramResponse.java
View File

@ -157,6 +157,10 @@ public class DiagramResponse {
response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Allow-Origin", "*");
response.setContentType(getContentType()); response.setContentType(getContentType());
if (idx < 0) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, String.format("Invalid diagram index: {0}", idx));
return;
}
final SourceStringReader reader = getSourceStringReader(uml); final SourceStringReader reader = getSourceStringReader(uml);
if (reader == null) { if (reader == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "No UML diagram found"); response.sendError(HttpServletResponse.SC_BAD_REQUEST, "No UML diagram found");
@ -285,19 +289,36 @@ public class DiagramResponse {
* @throws IOException if an input or output exception occurred * @throws IOException if an input or output exception occurred
*/ */
public void sendMap(String uml, int idx) throws IOException { public void sendMap(String uml, int idx) throws IOException {
if (idx < 0) {
idx = 0;
}
response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Allow-Origin", "*");
response.setContentType(getContentType()); response.setContentType(getContentType());
SourceStringReader reader = new SourceStringReader(uml);
final BlockUml blockUml = reader.getBlocks().get(0); if (idx < 0) {
if (StringUtils.isDiagramCacheable(uml)) { response.sendError(HttpServletResponse.SC_BAD_REQUEST, String.format("Invalid diagram index: {0}", idx));
addHeaderForCache(blockUml); return;
} }
final Diagram diagram = blockUml.getDiagram(); final SourceStringReader reader = getSourceStringReader(uml);
ImageData map = diagram.exportDiagram(new NullOutputStream(), idx, if (reader == null) {
new FileFormatOption(FileFormat.PNG, false)); response.sendError(HttpServletResponse.SC_BAD_REQUEST, "No UML diagram found");
return;
}
final BlockSelection blockSelection = getOutputBlockSelection(reader, idx);
if (blockSelection == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
if (StringUtils.isDiagramCacheable(uml)) {
addHeaderForCache(blockSelection.block);
}
final Diagram diagram = blockSelection.block.getDiagram();
if (diagram instanceof PSystemError) {
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
}
ImageData map = diagram.exportDiagram(
new NullOutputStream(),
blockSelection.systemIdx,
new FileFormatOption(FileFormat.PNG, false)
);
if (map.containsCMapData()) { if (map.containsCMapData()) {
PrintWriter httpOut = response.getWriter(); PrintWriter httpOut = response.getWriter();
final String cmap = map.getCMapData("plantuml"); final String cmap = map.getCMapData("plantuml");