[Gzz-commits] gzz/gzz/modules/email converter.py

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/12/07 15:42:20

Modified files:
        gzz/modules/email: converter.py 

Log message:
        Deal with empty Message-Ids

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/email/converter.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/email/converter.py
diff -u gzz/gzz/modules/email/converter.py:1.13 
gzz/gzz/modules/email/converter.py:1.14
--- gzz/gzz/modules/email/converter.py:1.13     Sat Dec  7 14:58:17 2002
+++ gzz/gzz/modules/email/converter.py  Sat Dec  7 15:42:20 2002
@@ -277,12 +277,18 @@
     print msgID
 
     print "\"", msgtype, "\""
+
+    addDefaultHeaders = 0
+    
     if msgtype == "message/rfc822":
        cbodyid = storeMail(body, mediaserver)
     elif msgtype == "text/plain":
         headerLinesB = java.util.ArrayList()
         headerLinesB.add('Content-Type: text/plain; charset=UTF-8')
-        headerLinesB.add('Message-ID: ' + msgID)
+        if msgID != None:
+            headerLinesB.add('Message-ID: ' + msgID)
+        else:
+            addDefaultHeaders = 1
         headerLinesB.add('Content-Transfer-Encoding: ' + msg.getencoding())
         
        tBody = java.lang.String(body, getCharset(msg))
@@ -291,9 +297,12 @@
         headerLinesB = java.util.ArrayList()
         headerLinesB.add('Content-Type: ' + msgtype 
                          + string.join(ctparams, ''))
-        headerLinesB.add('Message-ID: ' + msgID)
+        if msgID != None:
+            headerLinesB.add('Message-ID: ' + msgID)
+        else:
+            addDefaultHeaders = 1
         headerLinesB.add('Content-Transfer-Encoding: ' + msg.getencoding())
         
-       cbodyid = mediaserver.addDatum(body, headerLinesB, None, 0)
+       cbodyid = mediaserver.addDatum(body, headerLinesB, None, 
addDefaultHeaders)
 
     return cbodyid