You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2010/07/07 09:09:04 UTC
svn commit: r961262 - in /tika/trunk/tika-parsers/src:
main/java/org/apache/tika/parser/iwork/
test/java/org/apache/tika/parser/iwork/
Author: jukka
Date: Wed Jul 7 07:09:04 2010
New Revision: 961262
URL: http://svn.apache.org/viewvc?rev=961262&view=rev
Log:
TIKA-402: Support for iWork documents
Patch by Martijn van Groningen
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/KeynoteContentHandler.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/NumbersContentHandler.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/PagesContentHandler.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/KeynoteContentHandler.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/KeynoteContentHandler.java?rev=961262&r1=961261&r2=961262&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/KeynoteContentHandler.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/KeynoteContentHandler.java Wed Jul 7 07:09:04 2010
@@ -147,7 +147,7 @@ class KeynoteContentHandler extends Defa
return;
}
- String text = new String(ch, start, length).trim();
+ String text = new String(ch, start, length);
if (text.length() != 0) {
xhtml.characters(text);
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/NumbersContentHandler.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/NumbersContentHandler.java?rev=961262&r1=961261&r2=961262&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/NumbersContentHandler.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/NumbersContentHandler.java Wed Jul 7 07:09:04 2010
@@ -158,7 +158,7 @@ class NumbersContentHandler extends Defa
return;
}
- String text = new String(ch, start, length).trim();
+ String text = new String(ch, start, length);
if (text.length() > 0) {
xhtml.characters(text);
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/PagesContentHandler.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/PagesContentHandler.java?rev=961262&r1=961261&r2=961262&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/PagesContentHandler.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/PagesContentHandler.java Wed Jul 7 07:09:04 2010
@@ -16,17 +16,17 @@
*/
package org.apache.tika.parser.iwork;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tika.metadata.Metadata;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
class PagesContentHandler extends DefaultHandler {
private final XHTMLContentHandler xhtml;
@@ -132,7 +132,7 @@ class PagesContentHandler extends Defaul
return;
}
- String text = new String(ch, start, length).trim();
+ String text = new String(ch, start, length);
if (text.length() != 0) {
xhtml.characters(text);
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java?rev=961262&r1=961261&r2=961262&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/iwork/IWorkParserTest.java Wed Jul 7 07:09:04 2010
@@ -104,8 +104,7 @@ public class IWorkParserTest extends Tes
assertTrue(content.contains("Cell seven"));
assertTrue(content.contains("Cell eight"));
assertTrue(content.contains("Cell nine"));
- // FIXME: This assertion fails on Java 5, probably due to XML parsing
- // assertTrue(content.contains("Both Pages 1.x and Keynote 2.x")); // ...
+ assertTrue(content.contains("Both Pages 1.x and Keynote 2.x")); // ...
// text on page 2
assertTrue(content.contains("A second page...."));