routesearch: parse output in query_routesearch

[ypp-sc-tools.db-test.git] / yarrg / CommodsWeb.pm

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 24ee53e92f2c580930ff772a2720cd77738be95e..00c6f24b8cc5ce0ce9713592de4897428ffcdcd6 100644 (file)
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -48,7 +48,7 @@ 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
@@ -106,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 ($) {
@@ -160,7 +166,7 @@ sub dbw_lookup_string ($$$$$$$$) { # => ( $emsg, @dbresults )
     $each =~ s/^\s*//;  $each =~ s/\s*$//;  $each =~ s/\s+/ /g;
     my %m;
     my $results;
-    my @pats= ("$each", "$each\%", "\%$each\%");
+    my @pats= ("$each", "$each \%", "$each\%", "\%$each\%");
     if ($abbrev_initials) {
        push @pats, join ' ', map { "$_%" } split //, $each;
     }