X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.servlet.publish%2Fsrc%2Forg%2Fargeo%2Fapp%2Fservlet%2Fpublish%2FDbkServlet.java;h=dfef9114c31946f8a8f1d50f89db67f440fcdcd4;hb=c6b561fc1d45dd5abcbf86f99ae546bdc3b42b8d;hp=f1d26760b104ec20f0c35eb34f1e95bb64975d72;hpb=806ea79d59bd58307382e3b7693f52b10db3bc68;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java
index f1d2676..dfef911 100644
--- a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java
+++ b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java
@@ -43,7 +43,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
 import org.apache.xalan.processor.TransformerFactoryImpl;
-import org.argeo.api.cms.CmsTheme;
+import org.argeo.api.cms.ux.CmsTheme;
 import org.argeo.app.docbook.DbkType;
 import org.argeo.app.docbook.DbkUtils;
 import org.argeo.cms.auth.RemoteAuthUtils;
@@ -143,23 +143,29 @@ public class DbkServlet extends HttpServlet {
 							FopFactory fopFactory = FopFactory.newInstance(URI.create(req.getRequestURL().toString()));
 							resp.setContentType("application/pdf");
 
-							// DocBook to FO
-							byte[] foBytes;
-							try (ByteArrayOutputStream out = new ByteArrayOutputStream();) {
-								Result xmlOutput = new StreamResult(out);
-								Transformer docBookTransformer = docBoookFoTemplates.newTransformer();
-								docBookTransformer.transform(xmlInput, xmlOutput);
-								foBytes = out.toByteArray();
-							}
-
-							// FO to PDF
-							try (InputStream foIn = new ByteArrayInputStream(foBytes)) {
-								Fop fop = fopFactory.newFop("application/pdf", resp.getOutputStream());
-								Transformer fopTransformer = transformerFactory.newTransformer(); // identity
-								Source src = new StreamSource(foIn);
-								Result fopResult = new SAXResult(fop.getDefaultHandler());
-								fopTransformer.transform(src, fopResult);
-							}
+//							// DocBook to FO
+//							byte[] foBytes;
+//							try (ByteArrayOutputStream out = new ByteArrayOutputStream();) {
+//								Result xmlOutput = new StreamResult(out);
+//								Transformer docBookTransformer = docBoookFoTemplates.newTransformer();
+//								docBookTransformer.transform(xmlInput, xmlOutput);
+//								foBytes = out.toByteArray();
+//							}
+//
+//							// FO to PDF
+//							try (InputStream foIn = new ByteArrayInputStream(foBytes)) {
+//								Fop fop = fopFactory.newFop("application/pdf", resp.getOutputStream());
+//								Transformer fopTransformer = transformerFactory.newTransformer(); // identity
+//								Source src = new StreamSource(foIn);
+//								Result fopResult = new SAXResult(fop.getDefaultHandler());
+//								fopTransformer.transform(src, fopResult);
+//							}
+//
+							
+							Fop fop = fopFactory.newFop("application/pdf", resp.getOutputStream());
+							Transformer docBookTransformer = docBoookFoTemplates.newTransformer();
+							Result fopResult = new SAXResult(fop.getDefaultHandler());
+							docBookTransformer.transform(xmlInput, fopResult);
 
 						} else {
 							Result xmlOutput = new StreamResult(resp.getOutputStream());