Author: jpages Date: 2012-05-24 14:52:39 +0200 (Thu, 24 May 2012) New Revision: 672 Url: http://nuiton.org/repositories/revision/jrst/672 Log: Correction du probl?\195?\168me qui emp?\195?\170chait la g?\195?\169n?\195?\169ration d'un pdf avec des images sous windows. Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-24 08:44:53 UTC (rev 671) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-24 12:52:39 UTC (rev 672) @@ -296,7 +296,7 @@ ITextRenderer renderer = new ITextRenderer(); // Settings to resolve paths with the JRST User Agent - String absolutePath = fileIn.getParentFile().getAbsolutePath() + "/"; + String absolutePath = fileIn.getParentFile().getAbsolutePath(); JRSTUserAgent jrstUserAgent = new JRSTUserAgent(absolutePath); jrstUserAgent.setBaseURL(absolutePath); renderer.getSharedContext().setUserAgentCallback(jrstUserAgent); Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java 2012-05-24 08:44:53 UTC (rev 671) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java 2012-05-24 12:52:39 UTC (rev 672) @@ -26,10 +26,6 @@ */ public class JRSTUserAgent implements UserAgentCallback { - public static final String THIS_DIRECTORY = "./"; - - public static final String PREVIOUS_DIRECTORY = "../"; - /** to use log facility, just put in your code: log.info("..."); */ protected static Log log = LogFactory.getLog(JRSTUserAgent.class); @@ -124,13 +120,13 @@ } catch (MalformedURLException e) { XRLog.load("Could not read " + uri + " as a URL; may be relative. Testing using parent URL " + path); try { - URI resourcePath = new URI(path); + File filePath = new File(path); + URI resourcePath = filePath.toURI(); resourcePath = resourcePath.resolve(uri); // Builds the full resource path - File file = new File(resourcePath.toString()); - URL result = file.toURI().toURL(); - ret = result.toString(); + URL result = resourcePath.toURL(); + ret = result.toURI().toString(); } catch (Exception e1) { XRLog.exception("The default NaiveUserAgent cannot resolve the URL " + uri + " with base URL " + path); }