X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInbox.pm;h=e49f85fc0dbd78264b6ef2ecbf3365e766540b76;hb=95e5b6c343c45bb303db67fe7eb77e395c031e8d;hp=06ce9ebf8c464c3236760a17c60a686f430e8663;hpb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;p=public-inbox.git

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 06ce9ebf..e49f85fc 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -219,19 +219,22 @@ sub try_cat {
 
 sub description {
 	my ($self) = @_;
-	$self->{description} //= do {
+	($self->{description} //= do {
 		my $desc = try_cat("$self->{inboxdir}/description");
 		local $/ = "\n";
 		chomp $desc;
 		$desc =~ s/\s+/ /smg;
-		$desc eq '' ? '($INBOX_DIR/description missing)' : $desc;
-	};
+		$desc eq '' ? undef : $desc;
+	}) // '($INBOX_DIR/description missing)';
 }
 
 sub cloneurl {
 	my ($self) = @_;
-	$self->{cloneurl} //=
-		[ split(/\s+/s, try_cat("$self->{inboxdir}/cloneurl")) ];
+	($self->{cloneurl} //= do {
+		my $s = try_cat("$self->{inboxdir}/cloneurl");
+		my @urls = split(/\s+/s, $s);
+		scalar(@urls) ? \@urls : undef
+	}) // [];
 }
 
 sub base_url {
@@ -346,7 +349,7 @@ sub smsg_by_mid ($$) {
 	# favor the Message-ID we used for the NNTP article number:
 	defined(my $num = mid2num($self, $mid)) or return;
 	my $smsg = $over->get_art($num) or return;
-	PublicInbox::SearchMsg::psgi_cull($smsg);
+	PublicInbox::Smsg::psgi_cull($smsg);
 }
 
 sub msg_by_mid ($$;$) {
@@ -376,4 +379,19 @@ sub modified {
 	git($self)->modified; # v1
 }
 
+# returns prefix => pathname mapping
+# (pathname is NOT public, but prefix is used for Xapian queries)
+sub altid_map ($) {
+	my ($self) = @_;
+	$self->{-altid_map} //= eval {
+		require PublicInbox::AltId;
+		my $altid = $self->{altid} or return {};
+		my %h = map {;
+			my $x = PublicInbox::AltId->new($self, $_);
+			"$x->{prefix}" => $x->{filename}
+		} @$altid;
+		\%h;
+	} // {};
+}
+
 1;