Changeset 32eed98 for filter.c

Timestamp:

Dec 26, 2003, 2:49:54 PM (20 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

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

Children:

5f82eb3

Parents:

4357be8

Message:

2.1.3-pre-2
	Added perl filter elements.  Similar to having "filter <subfilter>"
	  in a filter, you may also have "perl <functionname>"
	  where <functionname> is passed an owl::Message object and
	  returns 0 or 1 depending on whether the message matches
	  that element of the filter.
	  [Note: currently this overloads the filtername element
	  of the filterelement structure to store the function name.
	  Perhaps we should change the name of this element to something
	  more general to avoid confusion?]

File:

• filter.c (modified) (2 diffs)

filter.c

@@ -84 +84 @@
         owl_filterelement_create_filter(fe, argv[i+1]);
         i++;
+      } else if (!strcasecmp(argv[i], "perl")) {
+        owl_filterelement_create_perl(fe, argv[i+1]);
+        i++;
       } else {
         error=1;
@@ -224 +227 @@
   }
 
-  /* now subfilters */
+  /* now subfilters and perl functions */
   for (i=0; i<j; i++) {
     owl_filter *subfilter;
                            
     fe=owl_list_get_element(&work_fes, i);
-    if (!owl_filterelement_is_filter(fe)) continue;
-
-    subfilter=owl_global_get_filter(&g, owl_filterelement_get_filtername(fe));
-    if (!subfilter) {
-      /* the filter does not exist, maybe because it was deleted.
-       * Default to not matching
-       */
-      owl_list_replace_element(&work_fes, i, owl_global_get_filterelement_false(&g));
-    } else if (owl_filter_message_match(subfilter, m)) {
-      owl_list_replace_element(&work_fes, i, owl_global_get_filterelement_true(&g));
-    } else {
-      owl_list_replace_element(&work_fes, i, owl_global_get_filterelement_false(&g));
+
+    if (owl_filterelement_is_filter(fe)) {
+
+      subfilter=owl_global_get_filter(&g, owl_filterelement_get_filtername(fe));
+      if (!subfilter) {
+        /* the filter does not exist, maybe because it was deleted.
+         * Default to not matching
+         */
+        owl_list_replace_element(&work_fes, i, owl_global_get_filterelement_false(&g));
+      } else if (owl_filter_message_match(subfilter, m)) {
+        owl_list_replace_element(&work_fes, i, owl_global_get_filterelement_true(&g));
+      } else {
+        owl_list_replace_element(&work_fes, i, owl_global_get_filterelement_false(&g));
+      }
+
+    } else if (owl_filterelement_is_perl(fe)) {
+      char *subname, *perlrv;
+      int   tf=0;
+
+      subname = owl_filterelement_get_filtername(fe);
+      if (!owl_perlconfig_is_function(subname)) {
+        owl_list_replace_element(&work_fes, i, owl_global_get_filterelement_false(&g));
+        continue;
+      }
+      perlrv = owl_perlconfig_call_with_message(subname, m);
+      if (perlrv) {
+        if (0 == strcmp(perlrv, "1")) {
+          tf=1;
+        }
+        owl_free(perlrv);
+      } 
+      if (tf) {
+        owl_list_replace_element(&work_fes, i, owl_global_get_filterelement_true(&g));
+      } else {
+        owl_list_replace_element(&work_fes, i, owl_global_get_filterelement_false(&g));
+      }
     }
   }