X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FWhitelist.java;h=7355a5c449ff7b2b995f8f0cebf07cec9e3727b6;hb=4b76a31e8f86bc8de673899bbb45252c01e9a0f6;hp=f85181d26f85a6b00297599a4eaa2018969995bb;hpb=9a6615359c1f811c1a20b2c21821b74f74c4af52;p=org.ibex.mail.git

diff --git a/src/org/ibex/mail/Whitelist.java b/src/org/ibex/mail/Whitelist.java
index f85181d..7355a5c 100644
--- a/src/org/ibex/mail/Whitelist.java
+++ b/src/org/ibex/mail/Whitelist.java
@@ -17,8 +17,11 @@ public class Whitelist extends SqliteDB {
     public Whitelist(String filename) throws SQLException {
         super(filename);
         SqliteTable whitelist = getTable("whitelist", "(email)");
+        whitelist.createIndex("email");
         SqliteTable pending   = getTable("pending",   "(spamid,email,message,date)");
         pending.reap("date");
+        pending.createIndex("spamid");
+        pending.createIndex("email");
     }
 
     public boolean handleRequest(org.ibex.net.Connection c) {
@@ -216,18 +219,12 @@ public class Whitelist extends SqliteDB {
                 PreparedStatement add = conn.prepareStatement("insert into pending values(?,?,?,?)");
                 add.setString(1, messageid);
                 add.setString(2, to.toString(false));
-                add.setString(3, streamToString(m.getStream()));
+                add.setString(3, SqliteDB.streamToString(m.getStream()));
                 add.setTimestamp(4, new Timestamp(System.currentTimeMillis()));
                 add.executeUpdate();
             }
         } catch (Exception e) { throw new RuntimeException(e); }
     }
 
-    private static String streamToString(Stream stream) throws Exception {
-        StringBuffer b = new StringBuffer();
-        for(String s = stream.readln(); s!=null; s=stream.readln())
-            b.append(s+"\n");
-        return b.toString();
-    }
 }