You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2016/01/24 23:22:23 UTC
[1/4] tika git commit: fix for TIKA-1840 contributed by zetisam
Repository: tika
Updated Branches:
refs/heads/master efb645ef4 -> 1bc61760e
fix for TIKA-1840 contributed by zetisam
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/52b82bdd
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/52b82bdd
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/52b82bdd
Branch: refs/heads/master
Commit: 52b82bddef7c7ae8a430c9871594295e71882055
Parents: fe841bc
Author: Sam Heijens <sa...@zeticon.com>
Authored: Fri Jan 22 11:09:48 2016 +0100
Committer: Sam Heijens <sa...@zeticon.com>
Committed: Fri Jan 22 11:09:48 2016 +0100
----------------------------------------------------------------------
.../org/apache/tika/parser/microsoft/HSLFExtractor.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/52b82bdd/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
----------------------------------------------------------------------
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
index 6f33de8..d370b50 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
@@ -137,7 +137,17 @@ public class HSLFExtractor extends AbstractPOIFSExtractor {
// Now any embedded resources
handleSlideEmbeddedResources(slide, xhtml);
- // TODO Find the Notes for this slide and extract inline
+
+ // TODO Find the Notes for this slide and extract inline
+ HSLFNotes notes = slide.getNotes();
+ if (notes != null) {
+ xhtml.startElement("div", "class", "slide-notes");
+
+ textRunsToText(xhtml, notes.getTextParagraphs());
+
+ xhtml.endElement("div");
+ }
+
// Slide complete
xhtml.endElement("div");
[4/4] tika git commit: Fix for TIKA-1840 contributed by Sam Heijens
this closes #72
Posted by ma...@apache.org.
Fix for TIKA-1840 contributed by Sam Heijens <sa...@zeticon.com> this closes #72
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/1bc61760
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/1bc61760
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/1bc61760
Branch: refs/heads/master
Commit: 1bc61760e172c4c78e6c8777798181a24fd28d13
Parents: b4b5316
Author: Chris Mattmann <ma...@apache.org>
Authored: Sun Jan 24 14:22:02 2016 -0800
Committer: Chris Mattmann <ma...@apache.org>
Committed: Sun Jan 24 14:22:02 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/1bc61760/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d00ceca..b3a0c27 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
Release 1.12 - Current Development
+ * Slide notes are now linked to the slide XHTML in the PPT output
+ (TIKA-1840).
+
* JSON tests in Tika server were updated to remove impossible casts
(Github-73).
[2/4] tika git commit: fix for TIKA-1840 contributed by zetisam --
fixed indentation
Posted by ma...@apache.org.
fix for TIKA-1840 contributed by zetisam -- fixed indentation
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/7d43bd7c
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/7d43bd7c
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/7d43bd7c
Branch: refs/heads/master
Commit: 7d43bd7c5f55afc9ce46d4e3bdea71102d49aa9d
Parents: 52b82bd
Author: Sam Heijens <sa...@zeticon.com>
Authored: Fri Jan 22 12:04:23 2016 +0100
Committer: Sam Heijens <sa...@zeticon.com>
Committed: Fri Jan 22 12:04:23 2016 +0100
----------------------------------------------------------------------
.../org/apache/tika/parser/microsoft/HSLFExtractor.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/7d43bd7c/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
----------------------------------------------------------------------
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
index d370b50..1ee61d2 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/HSLFExtractor.java
@@ -138,16 +138,16 @@ public class HSLFExtractor extends AbstractPOIFSExtractor {
handleSlideEmbeddedResources(slide, xhtml);
- // TODO Find the Notes for this slide and extract inline
- HSLFNotes notes = slide.getNotes();
- if (notes != null) {
+ // Find the Notes for this slide and extract inline
+ HSLFNotes notes = slide.getNotes();
+ if (notes != null) {
xhtml.startElement("div", "class", "slide-notes");
textRunsToText(xhtml, notes.getTextParagraphs());
xhtml.endElement("div");
}
-
+
// Slide complete
xhtml.endElement("div");
@@ -208,7 +208,7 @@ public class HSLFExtractor extends AbstractPOIFSExtractor {
for (HSLFShape shape : shapes) {
if (shape != null && !HSLFMasterSheet.isPlaceholder(shape)) {
if (shape instanceof HSLFTextShape) {
- HSLFTextShape tsh = (HSLFTextShape) shape;
+ HSLFTextShape tsh = (HSLFTextShape) shape;
String text = tsh.getText();
if (text != null) {
xhtml.element("p", text);
[3/4] tika git commit: Merge branch 'TIKA-1840' of
https://github.com/zetisam/tika into TIKA-1840
Posted by ma...@apache.org.
Merge branch 'TIKA-1840' of https://github.com/zetisam/tika into TIKA-1840
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/b4b5316e
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/b4b5316e
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/b4b5316e
Branch: refs/heads/master
Commit: b4b5316edfa15d112a3a59e9dae4f9c8d125e306
Parents: efb645e 7d43bd7
Author: Chris Mattmann <ma...@apache.org>
Authored: Sun Jan 24 14:20:00 2016 -0800
Committer: Chris Mattmann <ma...@apache.org>
Committed: Sun Jan 24 14:20:00 2016 -0800
----------------------------------------------------------------------
.../apache/tika/parser/microsoft/HSLFExtractor.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------