From dce674fa1a19593e8b9b3b2ddbe5524f9cc54714 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@helixcode.com>
Date: Mon, 27 Nov 2000 22:23:33 +0000
Subject: Moved the regex filter rule around - we've changed the format a bit.

2000-11-27  Jeffrey Stedfast  <fejj@helixcode.com>

	* filtertypes.xml: Moved the regex filter rule around - we've
	changed the format a bit.

	* filter-option.c (option_activate): Removed.
	(get_widget): Don't connect the activate signal.

	* filter-folder.c (validate): Updated.

	* filter-datespec.c (validate): Updated.

	* filter-part.c (filter_part_validate): Updated.

	* filter-input.c (validate): Check the filter-input type - if it's
	of type "regex", then check for regex validity.

	* filter-element.c (filter_element_validate): No longer takes a
	gpointer argument.
	(filter_element_new_type_name): Allow type "regex" and create a
	new filter-input with type "regex".

2000-11-24  Michael Meeks  <michael@helixcode.com>

	* filter-message-search.c (get_full_header): impl.
	(header_full_regex): use it.

2000-11-23  Michael Meeks  <michael@helixcode.com>

	* filter-message-search.c (header_full_regex): impl.

svn path=/trunk/; revision=6685
---
 filter/filtertypes.xml | 89 ++++++++++++--------------------------------------
 1 file changed, 21 insertions(+), 68 deletions(-)

(limited to 'filter/filtertypes.xml')

diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 3fa396f57b..3014d453df 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -64,18 +64,6 @@
         (match-all (not (header-soundex "From" ${sender})))
      </code>
     </option>
-    <option value="matches regex">
-     <title>matches regex</title>
-     <code>
-        (match-all (header-regex "From" ${sender}))
-     </code>
-    </option>
-    <option value="not match regex">
-     <title>does not match regex</title>
-     <code>
-        (match-all (not (header-regex "From" ${sender})))
-     </code>
-    </option>
    </input>
    <input type="string" name="sender"/>
  </part>
@@ -158,21 +146,6 @@
 	       (header-soundex "Cc" ${recipient}))))
      </code>
     </option>
-    <option value="matches regex">
-     <title>matches regex</title>
-     <code>
-	(match-all (or (header-regex "To" ${recipient})
-	    	       (header-regex "Cc" ${recipient})))
-     </code>
-    </option>
-    <option value="not match regex">
-     <title>does not match regex</title>
-     <code>
-	(match-all (not (or
-               (header-regex "To" ${recipient})
-	       (header-regex "Cc" ${recipient}))))
-     </code>
-    </option>
    </input>
    <input type="address" name="recipient"/>
  </part>
@@ -240,18 +213,6 @@
         (match-all (not (header-soundex "Subject" ${subject})))
      </code>
     </option>
-    <option value="matches regex">
-     <title>matches regex</title>
-     <code>
-	(match-all (header-regex "Subject" ${subject}))
-     </code>
-    </option>
-    <option value="not match regex">
-     <title>does not match regex</title>
-     <code>
-	(match-all (not (header-regex "Subject" ${subject}))
-     </code>
-    </option>
    </input>
    <input type="string" name="subject"/>
  </part>
@@ -332,18 +293,6 @@
         (match-all (not (header-soundex ${header-field} ${word})))
      </code>
     </option>
-    <option value="matches regex">
-     <title>matches regex</title>
-     <code>
-	(match-all (header-regex ${header-field} ${word}))
-     </code>
-    </option>
-    <option value="not match regex">
-     <title>does not match regex</title>
-     <code>
-	(match-all (not (header-regex ${header-field} ${word}))
-     </code>
-    </option>
    </input>
    <input type="string" name="word"/>
  </part>
@@ -363,18 +312,6 @@
 	(not (body-contains ${word}))
      </code>
     </option>
-    <option value="matches regex">
-     <title>matches regex</title>
-     <code>
-	(body-regex ${word})
-     </code>
-    </option>
-    <option value="not match regex">
-     <title>does not match regex</title>
-     <code>
-	(not (body-regex ${word}))
-     </code>
-    </option>
    </input>
    <input type="string" name="word"/>
  </part>
@@ -412,8 +349,7 @@
     </code>
    </option>
   </input>    
-  <input type="datespec" name="versus">
-  </input>
+  <input type="datespec" name="versus"/>
  </part>
 
  <part name="recv-date">
@@ -444,8 +380,7 @@
     </code>
    </option>
   </input>    
-  <input type="datespec" name="versus">
-  </input>
+  <input type="datespec" name="versus"/>
  </part>
 
  <part name="score">
@@ -476,8 +411,26 @@
     </code>
    </option>
   </input>
-  <input type="score" name="versus">
+  <input type="score" name="versus"/>
+ </part>
+
+ <part name="regex">
+  <title>Regex Match</title>
+  <input type="optionlist" name="match-type">
+   <option value="header">
+    <title>Message Header</title>
+    <code>
+       (match-all (header-full-regex ${expression}))
+    </code>
+   </option>
+   <option value="body">
+    <title>Message Body</title>
+    <code>
+       (match-all (body-regex ${expression}))
+    </code>
+   </option>
   </input>
+  <input type="regex" name="expression"/>
  </part>
 
  <part name="source">
-- 
cgit v1.2.3