Merge tag 'v1.6.1' into eidx

[public-inbox.git] / lib / PublicInbox / Over.pm

diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index 0957cbdd78cca6290832f93e25b7203977904456..49ba180b94478fa4dd92831f709715ffa0796849 100644 (file)
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -126,7 +126,7 @@ sub get_all {
        my $nr = scalar(@_) or return [];
        my $in = '?' . (',?' x ($nr - 1));
        do_get($self, <<"", { cull => 1, limit => $nr }, @_);
-SELECT num,ds,ddd FROM over WHERE num IN ($in)
+SELECT num,ts,ds,ddd FROM over WHERE num IN ($in)
 
 }
 
@@ -260,6 +260,27 @@ SELECT num,tid,ds,ts,ddd FROM over WHERE num = ? LIMIT 1
        $smsg ? load_from_row($smsg) : undef;
 }
 
+sub get_xref3 {
+       my ($self, $num, $raw) = @_;
+       my $dbh = dbh($self);
+       my $sth = $dbh->prepare_cached(<<'', undef, 1);
+SELECT ibx_id,xnum,oidbin FROM xref3 WHERE docid = ? ORDER BY ibx_id,xnum ASC
+
+       $sth->execute($num);
+       my $rows = $sth->fetchall_arrayref;
+       return $rows if $raw;
+       my $eidx_key_sth = $dbh->prepare_cached(<<'', undef, 1);
+SELECT eidx_key FROM inboxes WHERE ibx_id = ?
+
+       [ map {
+               my $r = $_;
+               $eidx_key_sth->execute($r->[0]);
+               my $eidx_key = $eidx_key_sth->fetchrow_array;
+               $eidx_key //= "missing://ibx_id=$r->[0]";
+               "$eidx_key:$r->[1]:".unpack('H*', $r->[2]);
+       } @$rows ];
+}
+
 sub next_by_mid {
        my ($self, $mid, $id, $prev) = @_;
        my $dbh = dbh($self);