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

[Marc Schiereck]

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

Modified files:
        gzz/modules/email: converter.py 
Added files:
        gzz/modules/email: DefaultEmailInStorm.java 

Log message:
        First version of DefaultEmailInStorm.

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

Patches:
Index: gzz/gzz/modules/email/converter.py
diff -u gzz/gzz/modules/email/converter.py:1.5 
gzz/gzz/modules/email/converter.py:1.6
--- gzz/gzz/modules/email/converter.py:1.5      Sun Nov  3 17:05:08 2002
+++ gzz/gzz/modules/email/converter.py  Sun Nov 10 19:37:55 2002
@@ -27,6 +27,7 @@
 def storeMailbox(file, mediaserver):
     mbox = mailbox.UnixMailbox(file)
 
+    mails = []
     while 1:
         msg = mbox.next()
         if not msg: break
@@ -50,16 +51,16 @@
     for line in header:
         tline = line.lower()
         for field in fields:
-           field = field.lower()
-           if tline[:len(field)] == field:
-               foundField = 1
-               break
+            field = field.lower()
+            if tline[:len(field)] == field:
+                foundField = 1
+                break
         if foundField:
-           foundField = 0
-           delLines = 1
+            foundField = 0
+            delLines = 1
         elif not (delLines and line[0] == ' '):
             result.append(line)
-           delLines = 0
+            delLines = 0
     return result
 
 def transformHeader(header, bodyID):
@@ -101,39 +102,43 @@
             ctparams = []
             submsg = mimetools.Message(mulmsg)
             headerLinesB = java.util.ArrayList()
-           
+            
             for param in submsg.getplist():
                 ctparams.append(string.join(['; ', param], ''))
 
             headerLinesB.add('Content-Type: ' + submsg.gettype()
                              + string.join(ctparams, ''))
             headerLinesB.add('Message-ID: ' + msgID)
-           headerLinesB.add('Content-Transfer-Encoding: ' + 
submsg.getencoding())
+            headerLinesB.add('Content-Transfer-Encoding: ' + 
submsg.getencoding())
 
             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, '')
+            header = header + transformHeader(submsg.headers, id)
+            header = string.join(header, '')
 
-           headerData += header
+            headerData += header
 
         headerData += '--' + msg.getparam("boundary") + '--\r\n\r\n'
-        mediaserver.addDatum(headerData, headerLinesH, None, 0)
+        id2 = mediaserver.addDatum(headerData, headerLinesH, None, 0)
+        eis = gzz.modules.email.DefaultEmailInStorm(mediaserver, id2)
     else:
         headerLinesH = java.util.ArrayList()
         headerLinesB = java.util.ArrayList()
+        headerLinesH.add('Content-Transfer-Encoding: binary')
         headerLinesH.add('Content-Type: message/rfc822')
         headerLinesB.add('Content-Type: ' + msgtype 
                          + string.join(ctparams, ''))
         headerLinesB.add('Message-ID: ' + msgID)
-       headerLinesB.add('Content-Transfer-Encoding: ' + msg.getencoding())
+        headerLinesB.add('Content-Transfer-Encoding: ' + msg.getencoding())
 
         body = string.join(msg.fp.readlines(), '')
         id = mediaserver.addDatum(body, headerLinesB, None, 0)
 
         header = string.join(transformHeader(msg.headers, id), '')
 
-        mediaserver.addDatum(header, headerLinesH, None, 0)
+        id2 = mediaserver.addDatum(header, headerLinesH, None, 0)
+        eis = gzz.modules.email.DefaultEmailInStorm(mediaserver, id2)
     mail.close()
+    return eis