X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2FCommodsWeb.pm;h=00c6f24b8cc5ce0ce9713592de4897428ffcdcd6;hp=036c7e99ffe4dd48a55324578f58aaa00754e4d1;hb=757318e3924059c13338aada3b29d668c20f6c36;hpb=c11d6fe65e9be995358d5f6d7657b3cff03ff40f

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 036c7e9..00c6f24 100644
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -48,9 +48,10 @@ BEGIN {
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw(&dbw_connect &ocean_list &sourcebasedir
+    @EXPORT      = qw(&dbw_connect &dbw_filename &ocean_list &sourcebasedir
 		      &to_json_shim &to_json_protecttags
 		      &set_ctype_utf8
+		      &expected_error &dbw_lookup_string
 		      &prettyprint_age &meta_prettyprint_age);
     %EXPORT_TAGS = ( );
 
@@ -73,6 +74,8 @@ sub sourcebasedir () {
 }
 
 sub datadir () {
+    my $edir= $ENV{'YARRG_DATA_DIR'};
+    return $edir if defined $edir;
     my $dir= dotperllibdir();
     if (stat "$dir/DATA") {
 	return "$dir/DATA";
@@ -89,7 +92,7 @@ my @ocean_list;
 sub ocean_list () {
     my $datadir= datadir();
     if (!@ocean_list) {
-	my $fn= "$datadir/master-info.txt";
+	my $fn= "$datadir/source-info.txt";
 	my $f= new IO::File $fn or die "$fn $!";
 	my @r;
 	while (<$f>) {
@@ -103,11 +106,17 @@ sub ocean_list () {
     return @ocean_list;
 }
 
-sub dbw_connect ($) {
+sub dbw_filename ($) {
     my ($ocean) = @_;
     die "unknown ocean $ocean ?"
 	unless grep { $_ eq $ocean } ocean_list();
-    return dbr_connect(datadir(), $ocean);
+    return dbr_filename(datadir(), $ocean);
+}
+
+sub dbw_connect ($) {
+    my ($ocean) = @_;
+    my $fn= dbw_filename($ocean);
+    return db_connect_core($fn);
 }
 
 sub to_json_shim ($) {
@@ -149,4 +158,48 @@ BEGIN { eval '
 }
 
 
+sub dbw_lookup_string ($$$$$$$$) { # => ( $emsg, @dbresults )
+    my ($each,
+	$sth, $stmt_nqs, $abbrev_initials, $maxambig,
+	$em_nomatch, $em_manyambig, $emf_ambiguous) = @_;
+    
+    $each =~ s/^\s*//;  $each =~ s/\s*$//;  $each =~ s/\s+/ /g;
+    my %m;
+    my $results;
+    my @pats= ("$each", "$each \%", "$each\%", "\%$each\%");
+    if ($abbrev_initials) {
+	push @pats, join ' ', map { "$_%" } split //, $each;
+    }
+    foreach my $pat (@pats) {
+	$sth->execute(($pat) x $stmt_nqs);
+	$results= $sth->fetchall_arrayref();
+	last if @$results==1;
+	$m{ $_->[0] }=1 for @$results;
+	$results= undef;
+    }
+    if (!$results) {
+	if (!%m) {
+	    return $em_nomatch;
+	} elsif (keys(%m) > $maxambig) {
+	    return $em_manyambig;
+	} else {
+	    return $emf_ambiguous->($each, join(', ', sort keys %m));
+	}
+    }
+    return (undef, @{ $results->[0] });
+}
+
+sub expected_error ($) {
+    my $r= { Emsg => $_[0] };
+    bless $r, 'CommodsWeb::ExpectedError';
+    die $r;
+}
+
+package CommodsWeb::ExpectedError;
+
+sub emsg ($) {
+    my ($self) = @_;
+    return $self->{Emsg};
+}
+
 1;