[Gzz-commits] gzz ./Gzz.py lava/gzz/modules/email/NewerFilter...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/01/07 18:27:01

Modified files:
        .              : Gzz.py 
        lava/gzz/modules/email: NewerFilter.java NewerFilterFn.java 
                                OlderFilter.java OlderFilterFn.java 
                                ToFilter.java 
        lava/gzz/potion/potions: AndFilter.java AndFilterFn.java 
                                 OrFilterFn.java 

Log message:
        Demo version of email client ready

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Gzz.py.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/NewerFilter.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/NewerFilterFn.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/OlderFilter.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/OlderFilterFn.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/ToFilter.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/AndFilter.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/AndFilterFn.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/OrFilterFn.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/Gzz.py
diff -u gzz/Gzz.py:1.69 gzz/Gzz.py:1.70
--- gzz/Gzz.py:1.69     Tue Jan  7 16:00:49 2003
+++ gzz/Gzz.py  Tue Jan  7 18:27:01 2003
@@ -283,7 +283,7 @@
 
             self.dimensions = []
 
-            for name in ("d.1", "d.2", "d.3", "d.email",
+            for name in ("d.1", "d.2", "d.3", "d.clone", "d.email",
                          "d.contain", "d.contain-list"):
                 attr = re.sub('(\.|-)', '_', name)
                 dim = self.space.getDim(getattr(gzz.zzutil.Ids, attr))
Index: gzz/lava/gzz/modules/email/NewerFilter.java
diff -u gzz/lava/gzz/modules/email/NewerFilter.java:1.1 
gzz/lava/gzz/modules/email/NewerFilter.java:1.2
--- gzz/lava/gzz/modules/email/NewerFilter.java:1.1     Mon Jan  6 06:42:54 2003
+++ gzz/lava/gzz/modules/email/NewerFilter.java Tue Jan  7 18:27:01 2003
@@ -15,7 +15,7 @@
        Space sp = c.space;
        Dim d_contain = sp.getDim(Ids.d_contain);
        Dim d_contain_list = sp.getDim(Ids.d_contain_list);
-        c 
=c.s(d_contain,1).s(d_contain_list,1).s(d_contain_list,1).s(d_contain_list,1).s(d_contain_list,1);
+        c =c.s(d_contain,1).s(d_contain_list,3);
        if(!c.t().substring(0, 6).equals("Date: ")){
            throw new Error();
        }
Index: gzz/lava/gzz/modules/email/NewerFilterFn.java
diff -u gzz/lava/gzz/modules/email/NewerFilterFn.java:1.2 
gzz/lava/gzz/modules/email/NewerFilterFn.java:1.3
--- gzz/lava/gzz/modules/email/NewerFilterFn.java:1.2   Tue Jan  7 16:49:08 2003
+++ gzz/lava/gzz/modules/email/NewerFilterFn.java       Tue Jan  7 18:27:01 2003
@@ -8,7 +8,8 @@
 import gzz.potion.potions.*;
 
 public class NewerFilterFn extends AbstractHead implements Function {
-
+    public static boolean dbg = false;
+    private static void pa(String s) { System.out.println(s); }
 
     public NewerFilterFn() {
        super(new Object[] {
@@ -20,7 +21,19 @@
 
        List result = new ArrayList();
        for(Iterator i = params[0].iterator(); i.hasNext();) {
-           Date d = (Date)i.next();
+           String s = (String)i.next();
+           int a = s.indexOf("."), b = s.indexOf(".", a+1);
+           int day = Integer.parseInt(s.substring(0, a));
+           int month = Integer.parseInt(s.substring(a+1, b)) - 1;
+           int year = Integer.parseInt(s.substring(b+1));
+           if(year < 50)
+               year = 100 + year;
+           else if(year < 100)
+               year = year;
+           else
+               year = year - 1900;
+           Date d = new Date(year, month, day);
+           if(dbg) pa("<<<"+d+">>> -- "+day+", "+month+", "+year);
            NewerFilter n = new NewerFilter(d);
            result.add(n);
        }
Index: gzz/lava/gzz/modules/email/OlderFilter.java
diff -u gzz/lava/gzz/modules/email/OlderFilter.java:1.1 
gzz/lava/gzz/modules/email/OlderFilter.java:1.2
--- gzz/lava/gzz/modules/email/OlderFilter.java:1.1     Mon Jan  6 06:42:54 2003
+++ gzz/lava/gzz/modules/email/OlderFilter.java Tue Jan  7 18:27:01 2003
@@ -15,7 +15,7 @@
        Space sp = c.space;
        Dim d_contain = sp.getDim(Ids.d_contain);
        Dim d_contain_list = sp.getDim(Ids.d_contain_list);
-       c 
=c.s(d_contain,1).s(d_contain_list,1).s(d_contain_list,1).s(d_contain_list,1).s(d_contain_list,1);
+       c =c.s(d_contain,1).s(d_contain_list,3);
        if(!c.t().substring(0,6).equals("Date: ")){
            throw new Error();
        }
Index: gzz/lava/gzz/modules/email/OlderFilterFn.java
diff -u gzz/lava/gzz/modules/email/OlderFilterFn.java:1.2 
gzz/lava/gzz/modules/email/OlderFilterFn.java:1.3
--- gzz/lava/gzz/modules/email/OlderFilterFn.java:1.2   Tue Jan  7 16:49:08 2003
+++ gzz/lava/gzz/modules/email/OlderFilterFn.java       Tue Jan  7 18:27:01 2003
@@ -8,7 +8,8 @@
 import gzz.potion.potions.*;
 
 public class OlderFilterFn extends AbstractHead implements Function {
-
+    public static boolean dbg = false;
+    private static void pa(String s) { System.out.println(s); }
 
     public OlderFilterFn() {
        super(new Object[] {
@@ -20,7 +21,19 @@
 
        List result = new ArrayList();
        for(Iterator i = params[0].iterator(); i.hasNext();) {
-           Date d = (Date)i.next();
+           String s = (String)i.next();
+           int a = s.indexOf("."), b = s.indexOf(".", a+1);
+           int day = Integer.parseInt(s.substring(0, a));
+           int month = Integer.parseInt(s.substring(a+1, b)) - 1;
+           int year = Integer.parseInt(s.substring(b+1));
+           if(year < 50)
+               year = 100 + year;
+           else if(year < 100)
+               year = year;
+           else
+               year = year - 1900;
+           Date d = new Date(year, month, day);
+           if(dbg) pa("<<<"+d+">>> -- "+day+", "+month+", "+year);
            OlderFilter o = new OlderFilter(d);
            result.add(o);
        }
Index: gzz/lava/gzz/modules/email/ToFilter.java
diff -u gzz/lava/gzz/modules/email/ToFilter.java:1.3 
gzz/lava/gzz/modules/email/ToFilter.java:1.4
--- gzz/lava/gzz/modules/email/ToFilter.java:1.3        Tue Jan  7 16:49:08 2003
+++ gzz/lava/gzz/modules/email/ToFilter.java    Tue Jan  7 18:27:01 2003
@@ -19,7 +19,7 @@
        Space sp = c.space;
        Dim d_contain = sp.getDim(Ids.d_contain);
        Dim d_contain_list = sp.getDim(Ids.d_contain_list);
-        c =c.s(d_contain,1).s(d_contain_list,1).s(d_contain_list,1);
+        c =c.s(d_contain,1).s(d_contain_list,2);
        if(!c.t().substring(0,4).equals("To: ")){
            throw new Error();
        }
Index: gzz/lava/gzz/potion/potions/AndFilter.java
diff -u gzz/lava/gzz/potion/potions/AndFilter.java:1.1 
gzz/lava/gzz/potion/potions/AndFilter.java:1.2
--- gzz/lava/gzz/potion/potions/AndFilter.java:1.1      Sun Jan  5 08:37:02 2003
+++ gzz/lava/gzz/potion/potions/AndFilter.java  Tue Jan  7 18:27:01 2003
@@ -11,6 +11,7 @@
        }
 
        public boolean filter(Cell c) {
+           System.out.println("Andfilter: "+f1+" "+f2+" "+f1.filter(c)+" 
"+f2.filter(c));
            return f1.filter(c) && f2.filter(c);
        }
 
Index: gzz/lava/gzz/potion/potions/AndFilterFn.java
diff -u gzz/lava/gzz/potion/potions/AndFilterFn.java:1.2 
gzz/lava/gzz/potion/potions/AndFilterFn.java:1.3
--- gzz/lava/gzz/potion/potions/AndFilterFn.java:1.2    Tue Jan  7 16:49:08 2003
+++ gzz/lava/gzz/potion/potions/AndFilterFn.java        Tue Jan  7 18:27:01 2003
@@ -21,9 +21,10 @@
        for(Iterator i = params[0].iterator(); i.hasNext();) {
            Filter f1 = (Filter)i.next();
            
-           for(Iterator j = params[0].iterator(); i.hasNext();) {
-               Filter f2  = (Filter)i.next();
+           for(Iterator j = params[1].iterator(); j.hasNext();) {
+               Filter f2  = (Filter)j.next();
                AndFilter f = new AndFilter(f1, f2);
+               //System.out.println("Made And filter: "+f);
                result.add(f);
            }
        }
Index: gzz/lava/gzz/potion/potions/OrFilterFn.java
diff -u gzz/lava/gzz/potion/potions/OrFilterFn.java:1.2 
gzz/lava/gzz/potion/potions/OrFilterFn.java:1.3
--- gzz/lava/gzz/potion/potions/OrFilterFn.java:1.2     Tue Jan  7 16:49:08 2003
+++ gzz/lava/gzz/potion/potions/OrFilterFn.java Tue Jan  7 18:27:01 2003
@@ -21,8 +21,8 @@
        for(Iterator i = params[0].iterator(); i.hasNext();) {
            Filter f1 = (Filter)i.next();
            
-           for(Iterator j = params[0].iterator(); i.hasNext();) {
-               Filter f2  = (Filter)i.next();
+           for(Iterator j = params[1].iterator(); j.hasNext();) {
+               Filter f2  = (Filter)j.next();
                OrFilter f = new OrFilter(f1, f2);
                result.add(f);
            }