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 2018/09/05 14:35:56 UTC
[tika] branch branch_1x updated (8a1392b -> 2fd54ff)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 8a1392b Merge remote-tracking branch 'origin/branch_1x' into branch_1x
new 8d70109 TIKA-2722 -- clean up setting calendar values
new 2fd54ff TIKA-2722 -- clean up setting calendar values, take2
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:
.../main/java/org/apache/tika/parser/pdf/PDFParser.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
[tika] 02/02: TIKA-2722 -- clean up setting calendar values, take2
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 2fd54ff31865089f154390fed42849e4572929e7
Author: TALLISON <ta...@apache.org>
AuthorDate: Wed Sep 5 10:35:44 2018 -0400
TIKA-2722 -- clean up setting calendar values, take2
---
tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
index c764940..bee971e 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
@@ -103,6 +103,8 @@ public class PDFParser extends AbstractParser implements Initializable {
private static volatile boolean HAS_WARNED = false;
private static final Object[] LOCK = new Object[0];
+ //the old "created" metadata. This will go away in Tika 2.0
+ private static final Property DEPRECATED_CREATED = Property.externalDate("created");
/**
* Metadata key for giving the document password to the parser.
@@ -268,6 +270,7 @@ public class PDFParser extends AbstractParser implements Initializable {
addMetadata(metadata, PDF.DOC_INFO_TRAPPED, info.getTrapped());
// TODO Remove these in Tika 2.0
Calendar created = info.getCreationDate();
+ addMetadata(metadata, DEPRECATED_CREATED, created);
addMetadata(metadata, PDF.DOC_INFO_CREATED, created);
addMetadata(metadata, TikaCoreProperties.CREATED, created);
Calendar modified = info.getModificationDate();
[tika] 01/02: TIKA-2722 -- clean up setting calendar values
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 8d70109af35dc94e0c7ce9437764cc2b7d064112
Author: TALLISON <ta...@apache.org>
AuthorDate: Wed Sep 5 10:20:30 2018 -0400
TIKA-2722 -- clean up setting calendar values
---
.../main/java/org/apache/tika/parser/pdf/PDFParser.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
index 750239f..c764940 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
@@ -16,7 +16,6 @@
*/
package org.apache.tika.parser.pdf;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLStreamException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -72,7 +71,6 @@ import org.apache.tika.sax.XHTMLContentHandler;
import org.apache.tika.utils.XMLReaderUtils;
import org.w3c.dom.Document;
import org.xml.sax.ContentHandler;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
/**
@@ -268,14 +266,14 @@ public class PDFParser extends AbstractParser implements Initializable {
addMetadata(metadata, TikaCoreProperties.TRANSITION_SUBJECT_TO_OO_SUBJECT, info.getSubject());
addMetadata(metadata, "trapped", info.getTrapped());
addMetadata(metadata, PDF.DOC_INFO_TRAPPED, info.getTrapped());
- // TODO Remove these in Tika 2.0
- addMetadata(metadata, "created", info.getCreationDate());
- addMetadata(metadata, PDF.DOC_INFO_CREATED, info.getCreationDate());
- addMetadata(metadata, TikaCoreProperties.CREATED, info.getCreationDate());
+ // TODO Remove these in Tika 2.0
+ Calendar created = info.getCreationDate();
+ addMetadata(metadata, PDF.DOC_INFO_CREATED, created);
+ addMetadata(metadata, TikaCoreProperties.CREATED, created);
Calendar modified = info.getModificationDate();
addMetadata(metadata, Metadata.LAST_MODIFIED, modified);
addMetadata(metadata, TikaCoreProperties.MODIFIED, modified);
- addMetadata(metadata, PDF.DOC_INFO_MODIFICATION_DATE, info.getModificationDate());
+ addMetadata(metadata, PDF.DOC_INFO_MODIFICATION_DATE, modified);
// All remaining metadata is custom
// Copy this over as-is
@@ -489,7 +487,7 @@ public class PDFParser extends AbstractParser implements Initializable {
private void addMetadata(Metadata metadata, Property property, Calendar value) {
if (value != null) {
- metadata.set(property, value.getTime());
+ metadata.set(property, value);
}
}