X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.servlet.publish%2Fsrc%2Forg%2Fargeo%2Fapp%2Fservlet%2Fpublish%2FFopServlet.java;h=3344d75c112af1ab7a6806c60d3082f421451b30;hb=03c171b5d502b461c534816c3c11cae889aef3c1;hp=5886970fa41e513916428d5157ddba1ee19d2602;hpb=7eb905fa975c388c5c6a70297fbcef90a1e9c559;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java
index 5886970..3344d75 100644
--- a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java
+++ b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java
@@ -35,7 +35,6 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.FopFactoryBuilder;
-import org.apache.xalan.processor.TransformerFactoryImpl;
 import org.apache.xmlgraphics.io.Resource;
 import org.apache.xmlgraphics.io.ResourceResolver;
 import org.argeo.api.acr.Content;
@@ -46,10 +45,12 @@ import org.argeo.app.geo.GpxUtils;
 import org.argeo.cms.acr.xml.XmlNormalizer;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
-import org.argeo.util.LangUtils;
+import org.argeo.cms.util.LangUtils;
+import org.geotools.api.feature.simple.SimpleFeature;
 import org.geotools.data.collection.ListFeatureCollection;
 import org.geotools.data.simple.SimpleFeatureCollection;
-import org.opengis.feature.simple.SimpleFeature;
+
+import net.sf.saxon.BasicTransformerFactory;
 
 /**
  * A servlet transforming an XML view of the data to either FOP or PDF.
@@ -92,7 +93,7 @@ public class FopServlet extends HttpServlet {
 			}
 
 			Source xmlInput = content.adapt(Source.class);
-			XmlNormalizer.print(xmlInput,0);
+			XmlNormalizer.print(xmlInput, 0);
 		}
 
 		Source xmlInput = content.adapt(Source.class);
@@ -131,6 +132,7 @@ public class FopServlet extends HttpServlet {
 			}
 
 			String p = href.startsWith("/") ? href : path + '/' + href;
+			p = URLDecoder.decode(p, StandardCharsets.UTF_8);
 			Content subContent = session.get(p);
 			return subContent.adapt(Source.class);
 		};
@@ -191,9 +193,7 @@ public class FopServlet extends HttpServlet {
 		documentBuilderFactory.setXIncludeAware(true);
 		documentBuilderFactory.setNamespaceAware(true);
 
-		// We must explicitly use the non-XSLTC transformer, as XSLTC is not working
-		// with DocBook stylesheets
-		transformerFactory = new TransformerFactoryImpl();
+		transformerFactory = new BasicTransformerFactory();
 //		transformerFactory = TransformerFactory.newDefaultInstance();
 		try {
 			String xslStr = LangUtils.get(properties, PROP_ARGEO_FO_XSL);