X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fcommod-email-processor;h=e65b2b6a91fcfe2237f6d8c123e0891a0ec5cebd;hp=b395aa8d851fc1ede7bc385968b20b65d8758eca;hb=19669922dd2393c23371ee1532824e528b897de0;hpb=efc8497c2414dfded724d7181e11df53b947e387

diff --git a/yarrg/commod-email-processor b/yarrg/commod-email-processor
index b395aa8..e65b2b6 100755
--- a/yarrg/commod-email-processor
+++ b/yarrg/commod-email-processor
@@ -123,33 +123,38 @@ sub main () {
 	     $islandid, $mid,
 	     map { $md{$_} } (qw(timestamp clientspec serverspec)));
 
-    my (%sth, %sub_cs, %cache_cs, %sth_insert);
+    my (%sth, %sub_cs, %cache_cs, %sth_insert, %sth_lookup);
 
     $sth_insert{'stall'}= $dbh->prepare(
                 "INSERT OR IGNORE
                         INTO stalls
                         (islandid, stallname) VALUES ($islandid, ?)
                 ");
-    $sth_insert{'commods'}= $dbh->prepare(
+    $sth_lookup{'stall'}= $dbh->prepare(
+                "SELECT stallid FROM stalls
+			WHERE islandid == $islandid AND stallname == ?
+                ");
+    $sth_insert{'commod'}= $dbh->prepare(
                 "INSERT OR IGNORE
                         INTO commods
                         (commodname) VALUES (?)
                 ");
+    $sth_lookup{'commod'}= $dbh->prepare(
+                "SELECT commodid FROM commods
+			WHERE commodname == ?
+                ");
 
     foreach my $cs (qw(stall commod)) {
-	my $sth_lookup= $dbh->prepare(
-                "SELECT ${cs}id FROM ${cs}s WHERE ${cs}name == ?;
-                ");
 	$sub_cs{$cs}= sub {
 	    my ($name)= @_;
 	    my $r= $cache_cs{$cs}{$name};
 	    return $r if defined $r;
-	    $sth_lookup->execute($name) or die;
-	    ($r)= $sth_lookup->fetchrow_array();
+	    $sth_lookup{$cs}->execute($name) or die;
+	    ($r)= $sth_lookup{$cs}->fetchrow_array();
 	    if (!defined $r) {
 		$sth_insert{$cs}->execute($name);
-		$sth_lookup->execute($name) or die;
-		($r)= $sth_lookup->fetchrow_array();
+		$sth_lookup{$cs}->execute($name) or die;
+		($r)= $sth_lookup{$cs}->fetchrow_array();
 		die unless defined $r;
 	    }
 	    $cache_cs{$cs}{$name}= $r;
@@ -190,8 +195,9 @@ sub main () {
     pipethrough_run_finish($pt, 'gunzip <$deduped_tsv.gz');
 
 #    print "\n";
-    $dbh->commit();
+    db_chkcommit(0);
 
+    # Warning!  Below runes are bogus.  Do not use NATURAL JOIN!
     # select * from ((buy natural join commods) natural join stalls) natural join islands;
     # select * from ((sell natural join commods) natural join stalls) natural join islands;