X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMsgmap.pm;h=7e0f34a4a172d0ff4f09271e573cfc9739b1404b;hb=9be89cc9f142e237387aa466f5c3d9fb75b3dd9e;hp=8fe17a9505f0db151fe8c7f8f67ff9170b54e0b9;hpb=f564327fd1e694056a4b13ed398cabd8d0d4c173;p=public-inbox.git

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index 8fe17a95..7e0f34a4 100644
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -20,7 +20,12 @@ sub new {
 		my $err = $!;
 		-d $d or die "$d not created: $err";
 	}
-	my $f = "$d/msgmap.sqlite3";
+	new_file($class, "$d/msgmap.sqlite3", $writable);
+}
+
+sub new_file {
+	my ($class, $f, $writable) = @_;
+
 	my $dbh = DBI->connect("dbi:SQLite:dbname=$f",'','', {
 		AutoCommit => 1,
 		RaiseError => 1,
@@ -33,11 +38,14 @@ sub new {
 
 	if ($writable) {
 		create_tables($dbh);
+		$dbh->begin_work;
 		$self->created_at(time) unless $self->created_at;
+		$dbh->commit;
 	}
 	$self;
 }
 
+# n.b. invoked directly by scripts/xhdr-num2mid
 sub meta_accessor {
 	my ($self, $key, $value) = @_;
 	use constant {
@@ -51,22 +59,14 @@ sub meta_accessor {
 	defined $value or
 		return $dbh->selectrow_array(meta_select, undef, $key);
 
-	$dbh->begin_work;
-	eval {
-		$prev = $dbh->selectrow_array(meta_select, undef, $key);
-
-		if (defined $prev) {
-			$dbh->do(meta_update, undef, $value, $key);
-		} else {
-			$dbh->do(meta_insert, undef, $key, $value);
-		}
-		$dbh->commit;
-	};
-	my $err = $@;
-	return $prev unless $err;
+	$prev = $dbh->selectrow_array(meta_select, undef, $key);
 
-	$dbh->rollback;
-	die $err;
+	if (defined $prev) {
+		$dbh->do(meta_update, undef, $value, $key);
+	} else {
+		$dbh->do(meta_insert, undef, $key, $value);
+	}
+	$prev;
 }
 
 sub last_commit {
@@ -82,10 +82,10 @@ sub created_at {
 sub mid_insert {
 	my ($self, $mid) = @_;
 	my $dbh = $self->{dbh};
-	use constant MID_INSERT => 'INSERT INTO msgmap (mid) VALUES (?)';
-	my $sth = $self->{mid_insert} ||= $dbh->prepare(MID_INSERT);
+	my $sql = 'INSERT OR IGNORE INTO msgmap (mid) VALUES (?)';
+	my $sth = $self->{mid_insert} ||= $dbh->prepare($sql);
 	$sth->bind_param(1, $mid);
-	$sth->execute;
+	return if $sth->execute == 0;
 	$dbh->last_insert_id(undef, undef, 'msgmap', 'num');
 }
 
@@ -160,6 +160,7 @@ sub create_tables {
 			'val VARCHAR(255) NOT NULL)');
 }
 
+# used by NNTP.pm
 sub id_batch {
 	my ($self, $num, $cb) = @_;
 	my $dbh = $self->{dbh};
@@ -173,4 +174,15 @@ sub id_batch {
 	$nr;
 }
 
+# only used for mapping external serial numbers (e.g. articles from gmane)
+# see scripts/xhdr-num2mid for usage
+sub mid_set {
+	my ($self, $num, $mid) = @_;
+	my $sth = $self->{mid_set} ||= do {
+		my $sql = 'INSERT OR IGNORE INTO msgmap (num, mid) VALUES (?,?)';
+		$self->{dbh}->prepare($sql);
+	};
+	$sth->execute($num, $mid);
+}
+
 1;