[aperture-commit] SF.net SVN: aperture:[2361] aperture/trunk/core/src/main/java/org/ semanticdesktop/aperture/crawler/mail/DataObjectFactory.java

[<my...@us...>]

Revision: 2361
          http://aperture.svn.sourceforge.net/aperture/?rev=2361&view=rev
Author:   mylka
Date:     2010-06-28 11:00:59 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
[3022302] fixed the multipart/related inside multipart/alternative attachments problem

Modified Paths:
--------------
    aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/crawler/mail/DataObjectFactory.java

Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/crawler/mail/DataObjectFactory.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/crawler/mail/DataObjectFactory.java	2010-06-25 15:45:35 UTC (rev 2360)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/crawler/mail/DataObjectFactory.java	2010-06-28 11:00:59 UTC (rev 2361)
@@ -1069,23 +1069,16 @@
 		
 		
         // nothing to return when there are no parts
-        int count = 0;
-        
-        if ((count = getNestedPartCount(part)) == -1) {
+        if (getNestedPartCount(part) <= 0) {
         	return parent;
         }
         
-        if (count == 0) {
-            return parent;
-        }
-
-        
         int plaintextindex = getPartWithMimeType(part, "text/plain");
         int htmlindex = getPartWithMimeType(part, "text/html");
-        int multipartMixedIndex = getPartWithMimeType(part, "multipart/mixed");
+        int multipartIndex = getPartWithMimeType(part, "multipart");
 
-        // first try the mulitpart/mixed alternative 
-        int index = multipartMixedIndex;
+        // first try the mulitpart alternative 
+        int index = multipartIndex;
         
         // if not available try to fetch the text/plain alternative
         if (index < 0) {
@@ -1094,7 +1087,7 @@
         
         // if not available, try to fetch the text/html alternative
         if (index < 0) {
-            index = getPartWithMimeType(part, "text/html");
+            index = htmlindex;
         }
 
         // if still not found, simply take the first available part;
@@ -1703,7 +1696,7 @@
         for (int i = 0; i < count; i++) {
             BodyPart bodyPart = multipart.getBodyPart(i);
             String partType = getMimeType(bodyPart);
-            if (mimeType.equalsIgnoreCase(partType)) {
+            if (partType.toLowerCase().startsWith(mimeType)) {
                 return i;
             }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.