Changeset cb769bb for owl.h

Timestamp:

Dec 26, 2006, 1:05:26 AM (17 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

446aa2b

Parents:

20eb22c

Message:

 r15874@phanatique:  nelhage | 2006-12-24 18:25:33 -0500
 Don't quit if we can't contact the hostmaster. 
 r15884@phanatique:  nelhage | 2006-12-24 18:56:03 -0500
 Respect the displayoutgoing variable
 r15885@phanatique:  nelhage | 2006-12-24 20:10:44 -0500
 You can now write filters based off arbitrary message attributes
 r15887@phanatique:  nelhage | 2006-12-24 22:59:39 -0500
  r15886@phanatique (orig r476):  nelhage | 2006-12-24 22:59:10 -0500
   r24493@heretique:  nelhage | 2006-12-24 22:59:02 -0500
   Moving zephyr initialization later, so that zephyr works again
  
 
 r15891@phanatique:  nelhage | 2006-12-25 14:40:08 -0500
 * perl messages hashes use `private', not `isprivate'
 * get rid of a perl warning if login fails
 r15900@phanatique:  nelhage | 2006-12-25 21:04:15 -0500
 Merging in filter regression tests from my local branch.
 r15926@phanatique:  nelhage | 2006-12-26 00:57:07 -0500
  r15901@phanatique:  nelhage | 2006-12-25 21:08:47 -0500
  Base framework for the filter rewrite system. Only understands regexes and true/false so far.
 
 r15927@phanatique:  nelhage | 2006-12-26 00:57:08 -0500
  r15902@phanatique:  nelhage | 2006-12-25 23:03:33 -0500
  support for negation and parentheses
 
 r15928@phanatique:  nelhage | 2006-12-26 00:57:08 -0500
  r15924@phanatique:  nelhage | 2006-12-26 00:16:30 -0500
  Now passing all tests except for recursion detection
 
 r15929@phanatique:  nelhage | 2006-12-26 00:57:08 -0500
  r15925@phanatique:  nelhage | 2006-12-26 00:52:09 -0500
  Checking for filter recursion loops
 

File:

• owl.h (modified) (3 diffs)

owl.h

@@ -400 +400 @@
 
 typedef struct _owl_filterelement {
-  int type;
+  int (*match_message)(struct _owl_filterelement *fe, owl_message *m);
+  /* Append a string representation of the filterelement onto buf*/
+  void (*print_elt)(struct _owl_filterelement *fe, char * buf);
+  /* Operands for and,or,not*/
+  struct _owl_filterelement *left, *right;
+  /* For regex filters*/
+  owl_regex re;
+  /* Used by regexes, filter references, and perl */
   char *field;
-  owl_regex re;
-  char *filtername;  /* for maching on another filter */
 } owl_filterelement;
 
@@ -409 +414 @@
   char *name;
   int polarity;
-  owl_list fes; /* filterelements */
+  owl_filterelement * root;
   int color;
   int cachedmsgid;  /* cached msgid: should move into view eventually */
@@ -555 +560 @@
   int malloced, freed;
   char *searchstring;
-  owl_filterelement fe_true;
-  owl_filterelement fe_false;
-  owl_filterelement fe_null;
   aim_session_t aimsess;
   aim_conn_t bosconn;