You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2025/01/27 16:41:17 UTC
(tika) branch branch_3x updated (3d2d97451 -> 9ddb3d43a)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch branch_3x
in repository https://gitbox.apache.org/repos/asf/tika.git
from 3d2d97451 TIKA-4326: update protobuf
new e3fcf9afa TIKA-4371 -- exclude (hopefully) unneeded provided dependencies from xmlbeans (#2104)
new 00fddf271 TIKA-4303: Handle OneNotePropertyEnum.CachedTitleString as RichEditTextUnicode (#2098)
new 9ddb3d43a remove errant debugging println from RTF parser
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tika-parent/pom.xml | 48 +++++++++++++++++++++
.../microsoft/onenote/OneNoteTreeWalker.java | 7 ++-
.../onenote/OneNoteTreeWalkerOptions.java | 3 +-
.../tika/parser/microsoft/rtf/TextExtractor.java | 3 --
.../microsoft/onenote/OneNoteParserTest.java | 10 +++++
.../test-tika-4303-Chinese-notes.one | Bin 0 -> 51816 bytes
6 files changed, 64 insertions(+), 7 deletions(-)
create mode 100644 tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-tika-4303-Chinese-notes.one
(tika) 01/03: TIKA-4371 -- exclude (hopefully) unneeded provided dependencies from xmlbeans (#2104)
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_3x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit e3fcf9afab3a4a8f4220255a269ce52bc4556917
Author: Tim Allison <ta...@apache.org>
AuthorDate: Mon Jan 27 10:43:13 2025 -0500
TIKA-4371 -- exclude (hopefully) unneeded provided dependencies from xmlbeans (#2104)
(cherry picked from commit 1b8c1e20466e8ddd844d353fc0a755edb9da1df8)
---
tika-parent/pom.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index f7ed21607..1968e0ade 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -893,6 +893,54 @@
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>5.3.0</version>
+ <!-- need to exclude these provided dependencies -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.javaparser</groupId>
+ <artifactId>javaparser-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.github.javaparser</groupId>
+ <artifactId>javaparser-symbol-solver-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.org.apache.xml.internal</groupId>
+ <artifactId>resolver</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>Saxon-HE</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- prevent zookeeper 3.6.2 from being used in Apache Solr emitter by solr 8.11.4 -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
(tika) 02/03: TIKA-4303: Handle OneNotePropertyEnum.CachedTitleString as RichEditTextUnicode (#2098)
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_3x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 00fddf27199d03d92b55f6246bf57b1f5dee63c5
Author: luman <lu...@outlook.com>
AuthorDate: Mon Jan 27 23:43:40 2025 +0800
TIKA-4303: Handle OneNotePropertyEnum.CachedTitleString as RichEditTextUnicode (#2098)
(cherry picked from commit 7f94520bfcbbf201c40da946249d912301bc58f8)
---
.../parser/microsoft/onenote/OneNoteTreeWalker.java | 7 +++++--
.../microsoft/onenote/OneNoteTreeWalkerOptions.java | 3 +--
.../parser/microsoft/onenote/OneNoteParserTest.java | 10 ++++++++++
.../test-documents/test-tika-4303-Chinese-notes.one | Bin 0 -> 51816 bytes
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalker.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalker.java
index 3f9907e78..82297e11d 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalker.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalker.java
@@ -393,7 +393,8 @@ class OneNoteTreeWalker {
private boolean propertyIsBinary(OneNotePropertyEnum property) {
return property == OneNotePropertyEnum.RgOutlineIndentDistance ||
property == OneNotePropertyEnum.NotebookManagementEntityGuid ||
- property == OneNotePropertyEnum.RichEditTextUnicode;
+ property == OneNotePropertyEnum.RichEditTextUnicode ||
+ property == OneNotePropertyEnum.CachedTitleString;
}
/**
@@ -508,7 +509,9 @@ class OneNoteTreeWalker {
dif.size());
}
if (propertyValue.propertyId.propertyEnum ==
- OneNotePropertyEnum.RichEditTextUnicode) {
+ OneNotePropertyEnum.RichEditTextUnicode
+ || propertyValue.propertyId.propertyEnum ==
+ OneNotePropertyEnum.CachedTitleString) {
if (!options.isOnlyLatestRevision()
|| (parentPropertyId != null &&
parentPropertyId.propertyEnum != OneNotePropertyEnum.ElementChildNodesOfVersionHistory)) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalkerOptions.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalkerOptions.java
index 8226654f9..54df93d0c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalkerOptions.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/onenote/OneNoteTreeWalkerOptions.java
@@ -29,8 +29,7 @@ public class OneNoteTreeWalkerOptions implements Serializable {
private boolean crawlAllFileNodesFromRoot = true;
private boolean onlyLatestRevision = true;
private Set<OneNotePropertyEnum> utf16PropertiesToPrint = new HashSet<>(
- Arrays.asList(OneNotePropertyEnum.ImageFilename, OneNotePropertyEnum.Author,
- OneNotePropertyEnum.CachedTitleString));
+ Arrays.asList(OneNotePropertyEnum.ImageFilename, OneNotePropertyEnum.Author));
/**
* Do this to ignore revisions and just parse all file nodes from the root recursively.
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java
index 8a8cb9d00..bab0a6fbc 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/onenote/OneNoteParserTest.java
@@ -288,4 +288,14 @@ public class OneNoteParserTest extends TikaTest {
assertEquals(1, StringUtils.countMatches(txt, "Sunday morning"));
}
+
+ /**
+ * TIKA-4303 - test extract Chinese
+ */
+ @Test
+ public void testExtractChinese() throws Exception {
+ Metadata metadata = new Metadata();
+ XMLResult xml = getXML("test-tika-4303-Chinese-notes.one", metadata);
+ assertContains("<p>中文标题</p>", xml.xml);
+ }
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-tika-4303-Chinese-notes.one b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-tika-4303-Chinese-notes.one
new file mode 100644
index 000000000..6ad119e73
Binary files /dev/null and b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/test-tika-4303-Chinese-notes.one differ
(tika) 03/03: remove errant debugging println from RTF parser
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_3x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 9ddb3d43a55a6861d7007a8f0ceadaddd9e21554
Author: tallison <ta...@apache.org>
AuthorDate: Mon Jan 27 11:40:57 2025 -0500
remove errant debugging println from RTF parser
---
.../main/java/org/apache/tika/parser/microsoft/rtf/TextExtractor.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/TextExtractor.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/TextExtractor.java
index e5a6ae6b4..5d57ca362 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/TextExtractor.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/rtf/TextExtractor.java
@@ -1086,9 +1086,6 @@ final class TextExtractor {
}
private void end(String tag) throws IOException, SAXException, TikaException {
- if ("b".equals(tag)) {
- System.out.println("ending b");
- }
out.endElement(XHTML, tag, tag);
}