You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by ka...@apache.org on 2017/04/16 11:55:23 UTC
svn commit: r1791603 - in /manifoldcf/trunk: ./
connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/
Author: kamaci
Date: Sun Apr 16 11:55:22 2017
New Revision: 1791603
URL: http://svn.apache.org/viewvc?rev=1791603&view=rev
Log:
Fix for CONNECTORS-1405.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java
manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1791603&r1=1791602&r2=1791603&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sun Apr 16 11:55:22 2017
@@ -22,7 +22,7 @@ CONNECTORS-1407: Extract email addresses
CONNECTORS-1406: Fix multiple To and From field bug at email.
(Furkan KAMACI)
-CONNECTORS-1405: Add filename metadata information for email.
+CONNECTORS-1405: Add file name of attachment metadata information for email.
(Furkan KAMACI)
CONNECTORS-1402: Add metadata information for email attachments.
Modified: manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java?rev=1791603&r1=1791602&r2=1791603&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java (original)
+++ manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConfig.java Sun Apr 16 11:55:22 2017
@@ -101,7 +101,7 @@ public class EmailConfig {
public static final String EMAIL_DATE = "date";
public static final String EMAIL_ATTACHMENT_ENCODING = "encoding of attachment";
public static final String EMAIL_ATTACHMENT_MIMETYPE = "mime type of attachment";
- public static final String EMAIL_ATTACHMENT_FILENAME = "file name of attachment";
+ public static final String EMAIL_ATTACHMENTNAME = "file name of attachment";
public static final String EMAIL_VERSION = "1.0";
// Date field names for filtering
@@ -118,7 +118,7 @@ public class EmailConfig {
public static final String ENCODING_FIELD = "encoding";
public static final String MIMETYPE_FIELD = "mimetype";
- public static final String FILENAME_FIELD = "filename";
+ public static final String ATTACHMENTNAME_FIELD = "attachmentname";
public static final String MAILSUBJECT_FIELD = "mailsubject";
//public static final String TO = "To";
Modified: manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java?rev=1791603&r1=1791602&r2=1791603&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java (original)
+++ manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java Sun Apr 16 11:55:22 2017
@@ -660,21 +660,21 @@ public class EmailConnector extends org.
rd.addField(EmailConfig.MIMETYPE_FIELD, "");
}
}
- } else if (metadata.toLowerCase(Locale.ROOT).equals(EmailConfig.EMAIL_ATTACHMENT_FILENAME)) {
+ } else if (metadata.toLowerCase(Locale.ROOT).equals(EmailConfig.EMAIL_ATTACHMENTNAME)) {
Object o = msg.getContent();
if (o != null) {
if (o instanceof Multipart) {
Multipart mp = (Multipart) o;
- String[] fileNames = new String[mp.getCount()];
+ String[] attachmentNames = new String[mp.getCount()];
for (int k = 0, n = mp.getCount(); k < n; k++) {
Part part = mp.getBodyPart(k);
if (isAttachment(part)) {
- fileNames[k] = part.getFileName();
+ attachmentNames[k] = part.getFileName();
}
}
- rd.addField(EmailConfig.FILENAME_FIELD, fileNames);
+ rd.addField(EmailConfig.ATTACHMENTNAME_FIELD, attachmentNames);
} else if (o instanceof String) {
- rd.addField(EmailConfig.FILENAME_FIELD, "");
+ rd.addField(EmailConfig.ATTACHMENTNAME_FIELD, "");
}
}
}