-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
+use v5.10.1;
use Test::More;
use PublicInbox::TestCommon;
-use PublicInbox::Import;
use PublicInbox::Config;
+use PublicInbox::Admin;
use File::Path qw(remove_tree);
require_mods(qw(DBD::SQLite Search::Xapian));
print $w $data or die;
close $w or die;
my $cmd = ['git', "--git-dir=$v1dir", 'fast-import', '--quiet'];
- PublicInbox::Import::run_die($cmd, undef, { 0 => $r });
+ xsys_e($cmd, undef, { 0 => $r });
}
-run_script(['-index', $v1dir]) or die 'v1 index failed';
+run_script(['-index', '--skip-docdata', $v1dir]) or die 'v1 index failed';
+
my $smsg;
{
my $cfg = PublicInbox::Config->new;
my $ibx = $cfg->lookup($addr);
+ my $lvl = PublicInbox::Admin::detect_indexlevel($ibx);
+ is($lvl, 'medium', 'indexlevel detected');
+ is($ibx->{-skip_docdata}, 1, '--skip-docdata flag set on -index');
$smsg = $ibx->over->get_art(1);
is($smsg->{ds}, 749520000, 'datestamp from git author time');
is($smsg->{ts}, 1285977600, 'timestamp from git committer time');
- my $res = $ibx->search->query("m:$smsg->{mid}");
- is(scalar @$res, 1, 'got one result for m:');
+ my $mset = $ibx->search->mset("m:$smsg->{mid}");
+ is($mset->size, 1, 'got one result for m:');
+ my $res = $ibx->search->mset_to_smsg($ibx, $mset);
is($res->[0]->{ds}, $smsg->{ds}, 'Xapian stored datestamp');
- $res = $ibx->search->query('d:19931002..19931002');
+ $mset = $ibx->search->mset('d:19931002..19931002');
+ $res = $ibx->search->mset_to_smsg($ibx, $mset);
is(scalar @$res, 1, 'got one result for d:');
is($res->[0]->{ds}, $smsg->{ds}, 'Xapian search on datestamp');
}
my $check_v2 = sub {
my $ibx = PublicInbox::Inbox->new({inboxdir => $v2dir,
address => $addr});
+ my $lvl = PublicInbox::Admin::detect_indexlevel($ibx);
+ is($lvl, 'medium', 'indexlevel detected after convert');
+ is($ibx->{-skip_docdata}, 1,
+ '--skip-docdata preserved after convert');
my $v2smsg = $ibx->over->get_art(1);
is($v2smsg->{ds}, $smsg->{ds},
'v2 datestamp from git author time');
is($v2smsg->{ts}, $smsg->{ts},
'v2 timestamp from git committer time');
- my $res = $ibx->search->query("m:$smsg->{mid}");
+ my $mset = $ibx->search->mset("m:$smsg->{mid}");
+ my $res = $ibx->search->mset_to_smsg($ibx, $mset);
is($res->[0]->{ds}, $smsg->{ds}, 'Xapian stored datestamp');
- $res = $ibx->search->query('d:19931002..19931002');
+ $mset = $ibx->search->mset('d:19931002..19931002');
+ $res = $ibx->search->mset_to_smsg($ibx, $mset);
is(scalar @$res, 1, 'got one result for d:');
is($res->[0]->{ds}, $smsg->{ds}, 'Xapian search on datestamp');
};