[Gzz-commits] gzz gzz/media/impl/PermanentTextScroll.java gzz...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/11/29 09:59:54

Modified files:
        gzz/media/impl : PermanentTextScroll.java 
        gzz/modules/email: converter.py 
        test/gzz/modules/email: converter.test 

Log message:
        changes together with Marc

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/PermanentTextScroll.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/email/converter.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/modules/email/converter.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/gzz/media/impl/PermanentTextScroll.java
diff -u gzz/gzz/media/impl/PermanentTextScroll.java:1.4 
gzz/gzz/media/impl/PermanentTextScroll.java:1.5
--- gzz/gzz/media/impl/PermanentTextScroll.java:1.4     Tue Aug 13 19:01:27 2002
+++ gzz/gzz/media/impl/PermanentTextScroll.java Fri Nov 29 09:59:53 2002
@@ -33,7 +33,7 @@
 
 public class PermanentTextScroll implements TextScrollBlock,
                   ScrollBlockManager.MediaserverScrollBlock {
-String rcsid = "$Id: PermanentTextScroll.java,v 1.4 2002/08/13 23:01:27 benja 
Exp $";
+String rcsid = "$Id: PermanentTextScroll.java,v 1.5 2002/11/29 14:59:53 benja 
Exp $";
 
     char[] chars;
 
@@ -80,7 +80,8 @@
         // to load GZZ1 diffs as text blocks (see GZZ1Handler.LegacyContent
         // javadoc for more info).
        if(!ct.equals("text/plain; charset=UTF-8") &&
-          !ct.equals("application/x-gzigzag-GZZ1")) {
+          !ct.equals("application/x-gzigzag-GZZ1") &&
+          !ct.equals("message/rfc822")) {
            loadingFailed = true;
            throw new Error("Unknown text block '"+ct+"'");
        }
Index: gzz/gzz/modules/email/converter.py
diff -u gzz/gzz/modules/email/converter.py:1.8 
gzz/gzz/modules/email/converter.py:1.9
--- gzz/gzz/modules/email/converter.py:1.8      Fri Nov 29 04:45:17 2002
+++ gzz/gzz/modules/email/converter.py  Fri Nov 29 09:59:53 2002
@@ -39,7 +39,9 @@
         header = p.sub('\r\n', header)
         body = p.sub('\r\n', body)
 
-        storeMail(header + '\r\n' + body, mediaserver)
+        mails.append(storeMail(header + '\r\n' + body, mediaserver))
+
+    return mails
 
 def delHeaderLines(header, fields):
     """Takes a list of header-lines and a list of header fields and
@@ -139,7 +141,7 @@
        print eis.getBody().makeString()
        print "----"
     mail.close()
-    return eis
+    return id2
 
 def isConvertible(body, charset):
     cBody = ""
@@ -164,6 +166,14 @@
     if msgtype == "message/rfc822":
         print "message/rfc822"
        storeMail(msg.fp.read(), mediaserver)
+    elif msgtype == "text/plain":
+        headerLinesB = java.util.ArrayList()
+        headerLinesB.add('Content-Type: text/plain; charset=UTF-8')
+        headerLinesB.add('Message-ID: ' + msgID)
+        headerLinesB.add('Content-Transfer-Encoding: ' + msg.getencoding())
+        
+        body = msg.fp.read()
+       cbodyid = mediaserver.addDatum(body, headerLinesB, None, 0)
     else:
         headerLinesB = java.util.ArrayList()
         headerLinesB.add('Content-Type: ' + msgtype 
Index: gzz/test/gzz/modules/email/converter.test
diff -u gzz/test/gzz/modules/email/converter.test:1.8 
gzz/test/gzz/modules/email/converter.test:1.9
--- gzz/test/gzz/modules/email/converter.test:1.8       Fri Nov 22 07:41:29 2002
+++ gzz/test/gzz/modules/email/converter.test   Fri Nov 29 09:59:53 2002
@@ -50,9 +50,10 @@
 mail1HeaderID = 
gzz.mediaserver.Mediaserver.Id("01689FB8C62D31E7610EA6CEF01AF3614F1DABC1AB")
 mail1BodyID   = 
gzz.mediaserver.Mediaserver.Id("016205C5FE4E8CF333F5C3475D07C5BAF9A0D0D2D0")
 
-mail1Header =  "Content-Type: message/external-body;\r\n"
-mail1Header += " access-type=\"x-storm\";\r\n"
-mail1Header += " block=\"storm:block:" + mail1BodyID.getString() + "\"\r\n"
+mail1Header =  (
+    "Content-Type: message/external-body;\r\n"
+    ' access-type="x-storm";\r\n' +
+    ' block="storm:block:<INSERT-ID-HERE>"\r\n')
 mail1Header += "\r\n"
 mail1Header += "Return-path: <address@hidden>\r\n"
 mail1Header += "Envelope-to: address@hidden"
@@ -74,7 +75,7 @@
 mail1Header += "Content-Length: 10\r\n"
 mail1Header += "Lines: 1\r\n"
 mail1Header += "Content-Transfer-Encoding: binary\r\n"
-mail1Header += "Content-ID: storm:block:" + mail1BodyID.getString() + 
"\r\n\r\n"
+mail1Header += "Content-ID: storm:block:<INSERT-ID-HERE>\r\n\r\n"
 
 mail1Body = "TestMail.\r\n"
 
@@ -234,7 +235,7 @@
     medServ = gzz.mediaserver.SimpleMediaserver(
               gzz.mediaserver.storage.TransientStorer())
 
-    gzz.modules.email.converter.storeMailbox(mboxfile, medServ)
+    ids = gzz.modules.email.converter.storeMailbox(mboxfile, medServ)
 
     p = re.compile( '(\r\n|\n)')
     mail1c = p.sub('\r\n', mail1)
@@ -245,11 +246,26 @@
     if mailIDs.size() != 7:
         raise java.lang.Error()
 
-    if not 
java.lang.String(medServ.getDatum(mail1HeaderID).getBytes()).equals(mail1Header):
-        raise java.lang.Error()
-    if not 
java.lang.String(medServ.getDatum(mail1BodyID).getBytes()).equals(mail1Body):
-        raise java.lang.Error()
-    if not 
java.lang.String(medServ.getDatum(mail2HeaderID).getBytes()).equals(mail2Header):
+    realMail1Header = java.lang.String(medServ.getDatum(ids[0]).getBytes())
+    print "--------\n%s\n----------" % (realMail1Header,)
+    for s in zip(realMail1Header.split('\r\n'), mail1Header.split('\r\n')):
+        print s[0]
+        print s[1]
+
+    mail1HeaderParts = mail1Header.split('<INSERT-ID-HERE>')
+    mail1HeaderParts = [re.escape(x) for x in mail1HeaderParts]
+    print mail1HeaderParts
+    expr = '%s([A-F0-9]*)%s([A-F0-9]*)%s' % \
+           (mail1HeaderParts[0], mail1HeaderParts[1], mail1HeaderParts[2])
+    match = re.match(expr, realMail1Header)
+
+    assert match
+    assert match.group(1) == match.group(2)
+    print "ID: "+match.group(1)
+
+    assert 
java.lang.String(medServ.getDatum(gzz.mediaserver.Mediaserver.Id(match.group(1))).getBytes()).equals(mail1Body)
+
+    if not 
java.lang.String(medServ.getDatum(ids[0]).getBytes()).equals(mail2Header):
         raise java.lang.Error()
     if not 
java.lang.String(medServ.getDatum(mail2BodyID).getBytes()).equals(mail2Body):
         raise java.lang.Error()