From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 12 Sep 2012 21:06:04 +0000 (+0100)
Subject: database editing etc. works
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=nj-awaymsg.git;a=commitdiff_plain;h=08ba06816e847a62edcef3aa430e0acf4c5ccdb3;hp=caf762dbfcd20ba1e64ac6dd5586eb7c5206c74c

database editing etc. works
---

diff --git a/mason/main b/mason/main
index 03a01d9..a9bc72e 100755
--- a/mason/main
+++ b/mason/main
@@ -54,8 +54,13 @@ $sth->execute();
 
 <&| txtable, tx => $row &>
 %    $sthi->execute($row->{'textid'});
+%    my $anyused = 0;
 %    while (my $rowi= $sthi->fetchrow_hashref()) {
 <tr><td>Used for:</td><td><% $rowi->{'emailaddr'} |h %></td></tr>
+%        $anyused++;
+%    }
+%    if ($anyused) {
+<tr><td colspan=2>Not currently in use</td></tr>
 %    }
 </&>
 <pre>
diff --git a/mason/save b/mason/save
index cedd05b..c749084 100755
--- a/mason/save
+++ b/mason/save
@@ -48,12 +48,15 @@ $dinsertq->execute($textid, $desc, $subject, $text);
 my $tdeleteq = $dbh->prepare("DELETE FROM addresses WHERE textid = ?");
 $tdeleteq->execute($textid);
 
+my $odeleteq = $dbh->prepare("DELETE FROM addresses WHERE emailaddr = ?");
+
 my $tinsertq = $dbh->prepare("INSERT INTO addresses (emailaddr, textid)".
 			     " VALUES (?,?)");
 my $tlistq = $dbh->prepare("SELECT * FROM config");
 $tlistq->execute();
 while (my $row = $tlistq->fetchrow_hashref()) {
     if ($ARGS{"u_".hquote($row->{'emailaddr'})}) {
+	$odeleteq->execute($row->{'emailaddr'});
 	$tinsertq->execute($row->{'emailaddr'}, $textid);
     }
 }