From d21bb445f81664931cfea1b42a43c6e28bcbc866 Mon Sep 17 00:00:00 2001 From: Shane McCarron Date: Mon, 7 Dec 2015 09:49:17 -0600 Subject: [PATCH 1/2] Added support for specifying format to proxy The proxy servlet only could generate PNG. Should be possible to proxy the other supported formats too. --- .../java/net/sourceforge/plantuml/servlet/ProxyServlet.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java b/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java index fda09aa..6761209 100644 --- a/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java +++ b/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java @@ -61,6 +61,7 @@ public class ProxyServlet extends HttpServlet { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + final String fmt = request.getParameter("format"); final String source = request.getParameter("src"); final String index = request.getParameter("idx"); final URL srcUrl; @@ -72,6 +73,10 @@ public class ProxyServlet extends HttpServlet { return; } + if (fmt != "") { + format = fmt; + } + // generate the response String diagmarkup = getSource(srcUrl); System.out.println("getSource=>" + diagmarkup); From d3e42fd17ad06fc25a221823be9faa47f60f2632 Mon Sep 17 00:00:00 2001 From: Maxime Sinclair Date: Thu, 10 Dec 2015 16:43:56 +0100 Subject: [PATCH 2/2] Parameter 'format' changed to 'fmt' and System.out deletion --- .../java/net/sourceforge/plantuml/servlet/ProxyServlet.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java b/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java index 6761209..215d2ed 100644 --- a/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java +++ b/src/main/java/net/sourceforge/plantuml/servlet/ProxyServlet.java @@ -61,7 +61,7 @@ public class ProxyServlet extends HttpServlet { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - final String fmt = request.getParameter("format"); + final String fmt = request.getParameter("fmt"); final String source = request.getParameter("src"); final String index = request.getParameter("idx"); final URL srcUrl; @@ -79,7 +79,6 @@ public class ProxyServlet extends HttpServlet { // generate the response String diagmarkup = getSource(srcUrl); - System.out.println("getSource=>" + diagmarkup); SourceStringReader reader = new SourceStringReader(diagmarkup); int n = index == null ? 0 : Integer.parseInt(index); List blocks = reader.getBlocks(); @@ -87,7 +86,7 @@ public class ProxyServlet extends HttpServlet { Diagram diagram = block.getDiagram(); UmlSource umlSrc = diagram.getSource(); String uml = umlSrc.getPlainString(); - System.out.println("uml=" + uml); + //System.out.println("uml=" + uml); // generate the response DiagramResponse dr = new DiagramResponse(response, getOutputFormat());