lib/PublicInbox/IMAPsearchqp.pm | 6 +++--- lib/PublicInbox/LeiOverview.pm | 2 +- lib/PublicInbox/Search.pm | 2 +- t/imap_searchqp.t | 6 +++--- diff --git a/lib/PublicInbox/IMAPsearchqp.pm b/lib/PublicInbox/IMAPsearchqp.pm index 78d9a20613726f1cb59df00176b24057f714c675..2fb92bb8eaf0c5f1f0cf57be37daae2bf9827146 100644 --- a/lib/PublicInbox/IMAPsearchqp.pm +++ b/lib/PublicInbox/IMAPsearchqp.pm @@ -124,7 +124,7 @@ sub ON { my ($self, $item) = @_; my $ts = yyyymmdd($item); my $end = $ts + 86399; # no leap day - push @{$self->{xap}}, "ts:$ts..$end"; + push @{$self->{xap}}, "rt:$ts..$end"; my $sql = $self->{sql} or return 1; $$sql .= " AND ts >= $ts AND ts <= $end"; } @@ -132,7 +132,7 @@ sub BEFORE { my ($self, $item) = @_; my $ts = yyyymmdd($item); - push @{$self->{xap}}, "ts:..$ts"; + push @{$self->{xap}}, "rt:..$ts"; my $sql = $self->{sql} or return 1; $$sql .= " AND ts <= $ts"; } @@ -140,7 +140,7 @@ sub SINCE { my ($self, $item) = @_; my $ts = yyyymmdd($item); - push @{$self->{xap}}, "ts:$ts.."; + push @{$self->{xap}}, "rt:$ts.."; my $sql = $self->{sql} or return 1; $$sql .= " AND ts >= $ts"; } diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm index 194c5e28aad8b07de799d15a6d667916cb089cab..080fe837bdadde2faeab1601a4c501c70c044d8c 100644 --- a/lib/PublicInbox/LeiOverview.pm +++ b/lib/PublicInbox/LeiOverview.pm @@ -86,7 +86,7 @@ sub _unbless_smsg { my ($smsg, $mitem) = @_; delete @$smsg{qw(lines bytes num tid)}; - $smsg->{rcvd} = _iso8601(delete $smsg->{ts}); # JMAP receivedAt + $smsg->{rt} = _iso8601(delete $smsg->{ts}); # JMAP receivedAt $smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate $smsg->{relevance} = get_pct($mitem) if $mitem; diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 7f68ee0122a8d5754d845ba97ee3559cd4600bfb..a4b40f94976b9c8897a322e032637d115d6dd923 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -376,7 +376,7 @@ $cb->($qp, $NVRP->new(DT, 'dt:')); # for IMAP, undocumented for WWW and may be split off go away $cb->($qp, $NVRP->new(BYTES, 'bytes:')); - $cb->($qp, $NVRP->new(TS, 'ts:')); + $cb->($qp, $NVRP->new(TS, 'rt:')); $cb->($qp, $NVRP->new(UID, 'uid:')); while (my ($name, $prefix) = each %bool_pfx_external) { diff --git a/t/imap_searchqp.t b/t/imap_searchqp.t index 049fd68084fadd0628132f919ca9fd944572ae43..6b4121ea91a876db331f584575b76595ba876593 100644 --- a/t/imap_searchqp.t +++ b/t/imap_searchqp.t @@ -76,17 +76,17 @@ $q = $parse->($s = qq{BEFORE 2-Oct-1993}); is_deeply($q->{sql}, \" AND ts <= $t0", 'BEFORE SQL'); $q = $parse->("FROM z $s"); - is($q->{xap}, qq{f:"z" ts:..$t0}, 'BEFORE Xapian'); + is($q->{xap}, qq{f:"z" rt:..$t0}, 'BEFORE Xapian'); $q = $parse->($s = qq{SINCE 2-Oct-1993}); is_deeply($q->{sql}, \" AND ts >= $t0", 'SINCE SQL'); $q = $parse->("FROM z $s"); - is($q->{xap}, qq{f:"z" ts:$t0..}, 'SINCE Xapian'); + is($q->{xap}, qq{f:"z" rt:$t0..}, 'SINCE Xapian'); $q = $parse->($s = qq{ON 2-Oct-1993}); is_deeply($q->{sql}, \" AND ts >= $t0 AND ts <= $t1", 'ON SQL'); $q = $parse->("FROM z $s"); - is($q->{xap}, qq{f:"z" ts:$t0..$t1}, 'ON Xapian'); + is($q->{xap}, qq{f:"z" rt:$t0..$t1}, 'ON Xapian'); } {