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 2024/10/25 13:28:38 UTC
(tika) branch TIKA-4338 updated (44967ecce -> bdd38ef79)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-4338
in repository https://gitbox.apache.org/repos/asf/tika.git
from 44967ecce TIKA-4338 -- remove tag soup everywhere else
add c18e47ad5 TIKA-4327: add comment
new fa620c3ee Merge branch 'main' into TIKA-4338
new bdd38ef79 TIKA-4338 -- remove tag soup everywhere else -- revert MatchingContentHandler and update tika-bundle-standard
The 2 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-bundles/tika-bundle-standard/pom.xml | 2 +-
.../main/java/org/apache/tika/sax/xpath/MatchingContentHandler.java | 4 ++++
tika-parent/pom.xml | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)
(tika) 02/02: TIKA-4338 -- remove tag soup everywhere else -- revert MatchingContentHandler and update tika-bundle-standard
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-4338
in repository https://gitbox.apache.org/repos/asf/tika.git
commit bdd38ef7901ae4786c48ae2fe1666d99dd11a4bb
Author: tallison <ta...@apache.org>
AuthorDate: Fri Oct 25 09:28:30 2024 -0400
TIKA-4338 -- remove tag soup everywhere else -- revert MatchingContentHandler and update tika-bundle-standard
---
tika-bundles/tika-bundle-standard/pom.xml | 2 +-
.../main/java/org/apache/tika/sax/xpath/MatchingContentHandler.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tika-bundles/tika-bundle-standard/pom.xml b/tika-bundles/tika-bundle-standard/pom.xml
index 3bc8cec76..1f47b5f50 100644
--- a/tika-bundles/tika-bundle-standard/pom.xml
+++ b/tika-bundles/tika-bundle-standard/pom.xml
@@ -174,7 +174,7 @@
jackcess|
jackcess-encrypt|
commons-lang3|
- tagsoup|
+ jsoup|
asm|
juniversalchardet|
vorbis-java-core|
diff --git a/tika-core/src/main/java/org/apache/tika/sax/xpath/MatchingContentHandler.java b/tika-core/src/main/java/org/apache/tika/sax/xpath/MatchingContentHandler.java
index 0648098d1..831611c06 100644
--- a/tika-core/src/main/java/org/apache/tika/sax/xpath/MatchingContentHandler.java
+++ b/tika-core/src/main/java/org/apache/tika/sax/xpath/MatchingContentHandler.java
@@ -69,6 +69,10 @@ public class MatchingContentHandler extends ContentHandlerDecorator {
if (matcher.matchesElement()) {
super.endElement(uri, localName, name);
}
+ // this was originally added for tagsoup, but we need it generally
+ if (!matchers.isEmpty()) {
+ matcher = matchers.removeFirst();
+ }
}
public void characters(char[] ch, int start, int length) throws SAXException {
(tika) 01/02: Merge branch 'main' into TIKA-4338
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-4338
in repository https://gitbox.apache.org/repos/asf/tika.git
commit fa620c3eeffda0f0298ea8bd4de2c33c699d5e00
Merge: 44967ecce c18e47ad5
Author: tallison <ta...@apache.org>
AuthorDate: Fri Oct 25 09:27:42 2024 -0400
Merge branch 'main' into TIKA-4338
tika-parent/pom.xml | 3 +++
1 file changed, 3 insertions(+)