Changeset 40458b9 for filterelement.c

Timestamp:

Dec 24, 2003, 7:35:21 PM (20 years ago)

Author:

James M. Kretchmar <kretch@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:

5c1393d

Parents:

dad943e

Message:

Filters of filters now work

File:

• filterelement.c (modified) (7 diffs)

filterelement.c

@@ -12 +12 @@
 #define OWL_FILTERELEMENT_NOT         7
 #define OWL_FILTERELEMENT_RE          8
-
+#define OWL_FILTERELEMENT_FILTER      9
 
 void owl_filterelement_create_null(owl_filterelement *fe)
@@ -18 +18 @@
   fe->type=OWL_FILTERELEMENT_NULL;
   fe->field=NULL;
+  fe->filtername=NULL;
 }
 
 void owl_filterelement_create_openbrace(owl_filterelement *fe)
 {
+  owl_filterelement_create_null(fe);
   fe->type=OWL_FILTERELEMENT_OPENBRACE;
-  fe->field=NULL;
 }
 
 void owl_filterelement_create_closebrace(owl_filterelement *fe)
 {
+  owl_filterelement_create_null(fe);
   fe->type=OWL_FILTERELEMENT_CLOSEBRACE;
-  fe->field=NULL;
 }
 
 void owl_filterelement_create_and(owl_filterelement *fe)
 {
+  owl_filterelement_create_null(fe);
   fe->type=OWL_FILTERELEMENT_AND;
-  fe->field=NULL;
 }
 
 void owl_filterelement_create_or(owl_filterelement *fe)
 {
+  owl_filterelement_create_null(fe);
   fe->type=OWL_FILTERELEMENT_OR;
-  fe->field=NULL;
 }
 
 void owl_filterelement_create_not(owl_filterelement *fe)
 {
+  owl_filterelement_create_null(fe);
   fe->type=OWL_FILTERELEMENT_NOT;
-  fe->field=NULL;
 }
 
 void owl_filterelement_create_true(owl_filterelement *fe)
 {
+  owl_filterelement_create_null(fe);
   fe->type=OWL_FILTERELEMENT_TRUE;
-  fe->field=NULL;
 }
 
 void owl_filterelement_create_false(owl_filterelement *fe)
 {
+  owl_filterelement_create_null(fe);
   fe->type=OWL_FILTERELEMENT_FALSE;
-  fe->field=NULL;
 }
 
 void owl_filterelement_create_re(owl_filterelement *fe, char *field, char *re)
 {
+  owl_filterelement_create_null(fe);
   fe->type=OWL_FILTERELEMENT_RE;
   fe->field=owl_strdup(field);
@@ -69 +71 @@
 }
 
+void owl_filterelement_create_filter(owl_filterelement *fe, char *name)
+{
+  owl_filterelement_create_null(fe);
+  fe->type=OWL_FILTERELEMENT_FILTER;
+  fe->filtername=owl_strdup(name);
+}
+
 void owl_filterelement_free(owl_filterelement *fe)
 {
   if (fe->field) owl_free(fe->field);
+  if (fe->filtername) owl_free(fe->filtername);
 }
 
@@ -133 +143 @@
 }
 
+int owl_filterelement_is_filter(owl_filterelement *fe)
+{
+  if (fe->type==OWL_FILTERELEMENT_FILTER) return(1);
+  return(0);
+}
+
 char *owl_filterelement_get_field(owl_filterelement *fe)
 {
-  return(fe->field);
+  if (fe->field) return(fe->field);
+  return("unknown-field");
+}
+
+char *owl_filterelement_get_filtername(owl_filterelement *fe)
+{
+  if (fe->filtername) return(fe->filtername);
+  return("unknown-filter");
 }
 
@@ -142 +165 @@
   if ( (fe->type==OWL_FILTERELEMENT_TRUE) ||
        (fe->type==OWL_FILTERELEMENT_FALSE) ||
-       (fe->type==OWL_FILTERELEMENT_RE) ) {
+       (fe->type==OWL_FILTERELEMENT_RE) ||
+       (fe->type==OWL_FILTERELEMENT_FILTER)) {
     return(1);
   }
@@ -148 +172 @@
 }
 
-
+/* caller must free the return */
 char *owl_filterelement_to_string(owl_filterelement *fe)
 {
-  /* return must be freed by caller */
-  
   if (owl_filterelement_is_openbrace(fe)) {
     return(owl_strdup("( "));
@@ -168 +190 @@
     return(owl_strdup("false "));
   } else if (owl_filterelement_is_re(fe)) {
-    char *buff;
-    buff=owl_malloc(LINE);
-    sprintf(buff, "%s %s ", fe->field, owl_regex_get_string(&(fe->re)));
-    return(buff);
+    return(owl_sprintf("%s %s ", fe->field, owl_regex_get_string(&(fe->re))));
+  } else if (owl_filterelement_is_filter(fe)) {
+    return(owl_sprintf("filter %s ", fe->filtername));
   }
-  return(owl_strdup(""));
+
+  return(owl_strdup("?"));
 }