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

[Marc Schiereck]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Marc Schiereck <address@hidden> 02/11/28 19:10:29

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

Log message:
        some changes

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

Patches:
Index: gzz/gzz/modules/email/converter.py
diff -u gzz/gzz/modules/email/converter.py:1.6 
gzz/gzz/modules/email/converter.py:1.7
--- gzz/gzz/modules/email/converter.py:1.6      Sun Nov 10 19:37:55 2002
+++ gzz/gzz/modules/email/converter.py  Thu Nov 28 19:10:29 2002
@@ -78,6 +78,10 @@
 
     return result
 
+def getCharset(msg):
+    for param in msg.getplist():
+        if param[0:7] == 'charset':
+           return param[8:] 
 
 def storeMail(mail, mediaserver):
     mail      = re.sub('(\r\n|\n)', '\r\n', mail)
@@ -87,6 +91,8 @@
     msgID     = msg.getheader("Message-ID")
     ctparams  = []
 
+    getCharset(msg)
+
     for param in msg.getplist():
         ctparams.append(string.join(['; ', param], ''))
 
@@ -114,6 +120,7 @@
             body = string.join(submsg.fp.readlines(), '')
             id = mediaserver.addDatum(body, headerLinesB, None, 0)
 
+
             header = ['--', msg.getparam("boundary") + '\r\n']
             header = header + transformHeader(submsg.headers, id)
             header = string.join(header, '')
@@ -123,6 +130,7 @@
         headerData += '--' + msg.getparam("boundary") + '--\r\n\r\n'
         id2 = mediaserver.addDatum(headerData, headerLinesH, None, 0)
         eis = gzz.modules.email.DefaultEmailInStorm(mediaserver, id2)
+       print eis.getSubject().makeString(), ": ", id2.getString()
     else:
         headerLinesH = java.util.ArrayList()
         headerLinesB = java.util.ArrayList()
@@ -135,10 +143,27 @@
 
         body = string.join(msg.fp.readlines(), '')
         id = mediaserver.addDatum(body, headerLinesB, None, 0)
+           
+       print "convertible:", isConvertible(body, getCharset(msg))
 
         header = string.join(transformHeader(msg.headers, id), '')
 
         id2 = mediaserver.addDatum(header, headerLinesH, None, 0)
         eis = gzz.modules.email.DefaultEmailInStorm(mediaserver, id2)
+       print eis.getSubject().makeString(), ": ", id2.getString()
     mail.close()
     return eis
+
+def isConvertible(body, charset):
+    cBody = ""
+    try:
+        cBody = java.lang.String(body, charset);
+    except java.io.UnsupportedEncodingException:
+        print charset, "not supported"
+       return 0
+
+    bBody = cBody.getBytes(charset)
+    if body.equals(bBody):  # somehow like this... just with body as a 
byte-array
+       return 1
+    else:
+       return 0