X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fqtextstringcheck;h=686a506aa4c348bfefbc2b0f73fd2e160785937a;hp=b2c101390589b01daf00d858c60f9d205d05ce83;hb=0759b42dbad7715339b0dceb5e910ea7698fa90a;hpb=fd6bf359d9051fe0c6d269a44bcc08cc53aa2fea

diff --git a/yarrg/web/qtextstringcheck b/yarrg/web/qtextstringcheck
index b2c1013..686a506 100755
--- a/yarrg/web/qtextstringcheck
+++ b/yarrg/web/qtextstringcheck
@@ -62,16 +62,29 @@ my $chk= $m->fetch_comp("check_${what}");
 my $mydbh;
 $dbh ||= ($mydbh= dbw_connect($ocean));
 
-my $sqlstmt= $chk->scall_method("sqlstmt");
-my $sth= $dbh->prepare($sqlstmt);
-my @sqlstmt_qs= $sqlstmt =~ m/\?/g;
+#print STDERR "qtsc string=\`$string'\n";
 
-#die "$sqlstmt @sqlstmt_qs";
+my ($sth, @sqlstmt_qs);
+if ($chk->method_exists('sqlstmt')) {
+	my $sqlstmt= $chk->scall_method("sqlstmt");
+	$sth= $dbh->prepare($sqlstmt);
+	@sqlstmt_qs= $sqlstmt =~ m/\?/g;
+}
 
 my $emsg= '';
 my @results;
-
-my @specs= $chk->attr('multiple') ? (split m#[/|,]#, $string) : ($string);
+my @specs;
+my $canontext;
+my $hooks = {	Emsg => \$emsg,		String => \$string,
+		Results => \@results,	Specs => \@specs,
+		Canon => \$canontext
+	    };
+
+if ($chk->method_exists('preparse')) {
+	$chk->call_method('preparse', h => $hooks);
+} else {
+	@specs= $chk->attr('multiple') ? (split m#[/|,]#, $string) : ($string);
+}
 
 no warnings qw(exiting);
 
@@ -81,7 +94,11 @@ foreach my $each (@specs) {
 	my $err= sub { $emsg= $_[0]; last; };
 	my %m;
 	my $results;
-	foreach my $pat ("$each", "$each\%", "\%$each\%") {
+	my @pats= ("$each", "$each\%", "\%$each\%");
+	if ($chk->attr_exists('abbrev_initials')) {
+		push @pats, join ' ', map { "$_%" } split //, $each;
+	}
+	foreach my $pat (@pats) {
 		$sth->execute(($pat) x @sqlstmt_qs);
 		$results= $sth->fetchall_arrayref();
 		last if @$results==1;
@@ -103,8 +120,17 @@ foreach my $each (@specs) {
 	push @results, $results->[0];
 };
 
+if (!defined $canontext) {
+	$canontext= join ' | ', map { $_->[0] } @results;
+}
+if ($chk->method_exists('postquery')) {
+	$chk->call_method('postquery', h => $hooks);
+}
+
 $emsg='' if !defined $emsg;
-my $canontext= join ' | ', map { $_->[0] } @results;
+@results=() if length $emsg;
+
+#print STDERR "qtsc emsg=\`$emsg' results=\`@results'\n";
 
 if ($format =~ /json/) {
 	$r->content_type($ctype or $format);