Changeset b699e9b

Timestamp:

Dec 24, 2006, 11:37:13 PM (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:

8f2ce3a

Parents:

ea67541

git-author:

Nelson Elhage <nelhage@mit.edu> (12/24/06 20:10:44)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/24/06 23:37:13)

Message:

You can now write filters based off arbitrary message attributes

File:

• filter.c (modified) (3 diffs)

filter.c

@@ -66 +66 @@
       error=1;
     } else {
-      if (!strcasecmp(argv[i], "class") ||
-          !strcasecmp(argv[i], "instance") ||
-          !strcasecmp(argv[i], "sender") ||
-          !strcasecmp(argv[i], "recipient") ||
-          !strcasecmp(argv[i], "body") ||
-          !strcasecmp(argv[i], "opcode") ||
-          !strcasecmp(argv[i], "realm") ||
-          !strcasecmp(argv[i], "type") ||
-          !strcasecmp(argv[i], "direction") ||
-          !strcasecmp(argv[i], "hostname") ||
-          !strcasecmp(argv[i], "login")) {
-        regexstr=owl_text_substitute(argv[i+1], "%me%", owl_zephyr_get_sender());
-        owl_filterelement_create_re(fe, argv[i], regexstr);
-        owl_free(regexstr);
-        i++;
-      } else if (!strcasecmp(argv[i], "filter")) {
+      if (!strcasecmp(argv[i], "filter")) {
         owl_filterelement_create_filter(fe, argv[i+1]);
         i++;
@@ -88 +73 @@
         i++;
       } else {
-        error=1;
-      }
+        regexstr=owl_text_substitute(argv[i+1], "%me%", owl_zephyr_get_sender());
+        owl_filterelement_create_re(fe, argv[i], regexstr);
+        owl_free(regexstr);
+        i++;
+      } 
     }
 
@@ -220 +208 @@
         match="none";
       }
+    } else {
+      match = owl_message_get_attribute_value(m,field);
+      if(match == NULL) match = "";
     }