diff -r b4c8a2760d6f -r d566d08c20d6 src/org/sonews/storage/DrupalMessage.java --- a/src/org/sonews/storage/DrupalMessage.java Fri Oct 21 17:35:29 2011 +0200 +++ b/src/org/sonews/storage/DrupalMessage.java Fri Oct 21 18:21:30 2011 +0200 @@ -209,26 +209,25 @@ return new DOMSource(d); } - private String readXhtmlText(String text, String subject, long parentId, String urlBase, String wwwRead, String wwwPost) throws TransformerException, IOException, ParserConfigurationException, SAXException { + private String readXhtmlText(String sourceText, String subject, long parentId, String urlBase, String wwwRead, String wwwPost) throws TransformerException, IOException, ParserConfigurationException, SAXException { /** * TODO: * - znovupoužívat XSL transformér (nejen v instanci) * - používat cache, ukládat si vygenerované články */ - String inputText = makeSimpleXHTML(text); + String wrappedText = makeSimpleXHTML(sourceText); Transformer paragraphTransformer = transformerFactory.newTransformer(new StreamSource(Resource.getAsStream("helpers/mimeXhtmlPart-make-paragraphs.xsl"))); - String paragraphedText; boolean tidyWasUsed = false; try { - StringWriter output = new StringWriter(2 * inputText.length()); - paragraphTransformer.transform(readDOM(inputText), new StreamResult(output)); + StringWriter output = new StringWriter(2 * wrappedText.length()); + paragraphTransformer.transform(readDOM(wrappedText), new StreamResult(output)); paragraphedText = output.toString(); } catch (Exception e) { log.log(Level.FINER, "HTML input was shitty – Tidy had to be called.", e); - StringWriter output = new StringWriter(2 * inputText.length()); - paragraphTransformer.transform(readDOM(tidyXhtml(inputText)), new StreamResult(output)); + StringWriter output = new StringWriter(2 * wrappedText.length()); + paragraphTransformer.transform(readDOM(tidyXhtml(wrappedText)), new StreamResult(output)); paragraphedText = output.toString(); tidyWasUsed = true; } @@ -240,11 +239,11 @@ xhtmlTransformer.setParameter("wwwRead", wwwRead); xhtmlTransformer.setParameter("wwwPost", wwwPost); xhtmlTransformer.setParameter("headComment", String.format("Drupal-NNTP bridge. Transformed: %1$tc. Tidy had to be used: %2$b", new Date(), tidyWasUsed)); - StringReader input = new StringReader(paragraphedText); - StringWriter output = new StringWriter(2 * paragraphedText.length()); - xhtmlTransformer.transform(new StreamSource(input), new StreamResult(output)); + StringReader paragraphedReader = new StringReader(paragraphedText); + StringWriter xhtmlWriter = new StringWriter(2 * paragraphedText.length()); + xhtmlTransformer.transform(new StreamSource(paragraphedReader), new StreamResult(xhtmlWriter)); - return output.toString(); + return xhtmlWriter.toString(); } /**