Fix broken updates, use 15.0 tree.

3 files changed, 6 insertions, 3 deletions

diff --git a/bin/sbodb.pl b/bin/sbodb.pl
index 06c8215..fc2d3ec 100755
--- a/bin/sbodb.pl
+++ b/bin/sbodb.pl
@@ -160,6 +160,7 @@ EOF
 
 open $tagstxt, "<" . $sbopath . "/TAGS.txt" or die $!;
 while(<$tagstxt>) {
+	my %seen;
 	my ($build, $t, @tags);
 	chomp;
 	next if /: No tags found for/;
@@ -167,6 +168,7 @@ while(<$tagstxt>) {
 	@tags = split /,/, $t;
 	for(@tags) {
 		next if /^\s*$/;
+		next if $seen{$_}++;
 		s/'/''/g;
 		print <<EOF;
 insert into tags values($buildids{$build}, '$_');
diff --git a/bin/sbotools-update-db.sh b/bin/sbotools-update-db.sh
index eadf8c3..ec6a22f 100755
--- a/bin/sbotools-update-db.sh
+++ b/bin/sbotools-update-db.sh
@@ -24,6 +24,7 @@ if [ -e $DATEFILE ] && diff $DATEFILE $DATEFILE.new > /dev/null ; then
 	exit 0
 fi
 
+rm -f $DBFILE.update
 ( $SCRIPT $SBOTREE | $SQLITE3 $DBFILE.update ) &> $LOG
 
 if [ "$?" = "0" ]; then
diff --git a/bin/whatis2sqlite.pl b/bin/whatis2sqlite.pl
index b91f98d..d5f1c6c 100755
--- a/bin/whatis2sqlite.pl
+++ b/bin/whatis2sqlite.pl
@@ -76,9 +76,9 @@ sub make_sql {
 
 	return if $seen{"$page^^$sect"}++;
 
-	# 15.0 has double-quotes in some descriptions.
-	$desc =~ s/"/""/g;
+	# 15.0 has single-quotes in some descriptions.
+	$desc =~ s/'/''/g;
 	print <<EOF
-insert into whatis values (null, "$page", "$sect", "$desc");
+insert into whatis values (null, '$page', '$sect', '$desc');
 EOF
 }