X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=server.pl;h=f1ea91bbcf41413d0790a0e1d471003d279d5f50;hb=0b72c4a40c91e195ce264d4099a8de6011103ff0;hp=4dc54d5942cbd112862a89d3fa879138b4e14633;hpb=e80c2c6c3eca288c285551d35fe8ee0832731c8a;p=Biblio-Z3950.git

diff --git a/server.pl b/server.pl
index 4dc54d5..f1ea91b 100755
--- a/server.pl
+++ b/server.pl
@@ -8,6 +8,7 @@ use Net::Z3950::OID;
 use Data::Dumper;
 use COBISS;
 use Aleph;
+use Encode;
 
 my $databases = {
 	'COBISS' => 'COBISS',
@@ -62,6 +63,8 @@ diag "using $module for $database ", Dumper( $from );
         return;
     }
 
+	$query = decode('utf-8', $query); # FIXME Zoom encoding
+
 diag "search for $query";
 
     my $setname  = $self->{SETNAME};
@@ -118,13 +121,13 @@ sub FetchHandle {
         return;
     }
 
-    $self->{BASENAME} = "HtmlZ3950";
+    $self->{BASENAME} = $rs->{database};
 
 	my $format =
 		$req_form eq Net::Z3950::OID::xml()     ? 'xml' :
 		$req_form eq Net::Z3950::OID::unimarc() ? 'unimarc' :
 		$req_form eq Net::Z3950::OID::usmarc()  ? 'marc' : # XXX usmarc -> marc
-		undef;
+		die "unknown format $req_form";
 
 	if ( ! $format ) {
 		warn "ERROR: $req_form format not supported";
@@ -262,7 +265,7 @@ warn "# usemap ", dump($usemap);
         }
     }
 
-    my $q = $prefix . $self->{term};
+    my $q = $prefix . $self->{term} . '*';
 	print "# q: $q\n";
 	return $q;
 }