Added the "year" criterion.

diff --git a/mymail.1 b/mymail.1
index 67b390b..fc4749b 100644 (file)
--- a/mymail.1
+++ b/mymail.1
@@ -98,9 +98,9 @@ mboxes completely, which can be slow. However, header conditions are
 checked first to read the bodies only for mails which fulfill them
 entirely.
 .TP
 checked first to read the bodies only for mails which fulfill them
 entirely.
 .TP

-\fB8h\fR, \fBtoday\fR, \fB24h\fR, \fBweek\fR, and \fBmonth\fR selects
-mails received respectively during the last 8, 24, 24, 7 * 24 hours or
-31 * 24 hours.
+\fB8h\fR, \fBtoday\fR, \fB24h\fR, \fBweek\fR, \fBmonth\fR, and
+\fByear\fR selects mails received during the last 8, 24, 24, 7 * 24
+hours, 31 * 24 hours, and 365 * 24 hours respectively.

 .TP
 \fByesterday\fR selects mails received between 48h and 24h ago.
 .TP
 .TP
 \fByesterday\fR selects mails received between 48h and 24h ago.
 .TP

diff --git a/mymail.c b/mymail.c
index ffc5621..fe2d9a0 100644 (file)
--- a/mymail.c
+++ b/mymail.c
@@ -733,6 +733,13 @@ void init_condition(struct search_condition *condition, char *full_string) {
     condition->interval_stop = 0;
   }
 
     condition->interval_stop = 0;
   }
 

+  else if(strcmp(search_field, "24h") == 0 ||
+          strcmp(search_field, "today") == 0) {
+    condition->field_id = ID_INTERVAL;
+    condition->interval_start = time(0) - 3600 * 24;
+    condition->interval_stop = 0;
+  }
+

   else if(strcmp(search_field, "week") == 0) {
     condition->field_id = ID_INTERVAL;
     condition->interval_start = time(0) - 3600 * 24 * 7;
   else if(strcmp(search_field, "week") == 0) {
     condition->field_id = ID_INTERVAL;
     condition->interval_start = time(0) - 3600 * 24 * 7;


@@ -745,10 +752,9 @@ void init_condition(struct search_condition *condition, char *full_string) {
     condition->interval_stop = 0;
   }
 
     condition->interval_stop = 0;
   }
 

-  else if(strcmp(search_field, "24h") == 0 ||
-          strcmp(search_field, "today") == 0) {
+  else if(strcmp(search_field, "year") == 0) {

     condition->field_id = ID_INTERVAL;
     condition->field_id = ID_INTERVAL;

-    condition->interval_start = time(0) - 3600 * 24;
+    condition->interval_start = time(0) - 3600 * 24 * 365;

     condition->interval_stop = 0;
   }
 
     condition->interval_stop = 0;
   }