You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by th...@apache.org on 2014/04/24 14:14:09 UTC
svn commit: r1589687 -
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java
Author: thaichat04
Date: Thu Apr 24 12:14:09 2014
New Revision: 1589687
URL: http://svn.apache.org/r1589687
Log:
[TIKA-1279] Missing return lines at output of SourceCodeParser
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java?rev=1589687&r1=1589686&r2=1589687&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java Thu Apr 24 12:14:09 2014
@@ -38,6 +38,7 @@ import org.apache.tika.metadata.TikaCore
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
+import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -90,7 +91,7 @@ public class SourceCodeParser implements
String line;
int nbLines = 0;
while ((line = reader.readLine()) != null) {
- out.append(line);
+ out.append(line + System.lineSeparator());
String author = parserAuthor(line);
if (author != null) {
metadata.add(TikaCoreProperties.CREATOR, author);
@@ -98,13 +99,12 @@ public class SourceCodeParser implements
nbLines ++;
}
metadata.set("LoC", String.valueOf(nbLines));
-
+ XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
Renderer renderer = getRenderer(type.toString());
String codeAsHtml = renderer.highlight(name, out.toString(), charset.name(), false);
- char[] charArray = codeAsHtml.toCharArray();
- handler.startDocument();
- handler.characters(charArray, 0, charArray.length);
- handler.endDocument();
+ xhtml.startDocument();
+ xhtml.element("p", codeAsHtml);
+ xhtml.endDocument();
}
} finally {
reader.close();