include full filed specification, along with = or : in usemap

diff --git a/Aleph.pm b/Aleph.pm
index 27a650b..3f6eabe 100644 (file)
--- a/Aleph.pm
+++ b/Aleph.pm
@@ -50,15 +50,15 @@ sub diag {
 # WYR - Godina izdavanja
 
 sub usemap {{
-       4               => 'WTI',
-       7               => 'ISBN',
-       8               => 'ISSN',
-       1003            => 'AUT',
-       16              => 'DDC',
-       21              => 'SUB',
-       12              => 'LCN',
+       4               => 'WTI=',
+       7               => 'ISBN=',
+       8               => 'ISSN=',
+       1003    => 'AUT=',
+       16              => 'DDC=',
+       21              => 'SUB=',
+       12              => 'LCN=',
 #      1007    => '',
-       1016    => 'WRD',
+       1016    => 'WRD=',
 }};
 
 our $session_id;

diff --git a/server.pl b/server.pl
index f607591..ea711c5 100755 (executable)
--- a/server.pl
+++ b/server.pl
@@ -6,7 +6,7 @@ use strict;
 use Net::Z3950::SimpleServer;
 use Net::Z3950::OID;
 use Data::Dumper;
-use COBISS;
+#use COBISS;
 use Aleph;
 use GoogleBooks;
 use vuFind;
@@ -279,7 +279,7 @@ warn "# usemap ", dump($usemap);
                warn "# using custom prefix_term query";
                $q = $usemap->{prefix_term}->( $prefix, $self->{term} );
        } else {
-       $q = ( $prefix ? $prefix . '=' : '' ) . $self->{term} . '*';
+       $q = $prefix . $self->{term} . '*';
        }
        print "# q: $q\n";
        return $q;

diff --git a/t/yaz/GoogleBooks b/t/yaz/GoogleBooks
index b52bf2b..7e23c21 100644 (file)
--- a/t/yaz/GoogleBooks
+++ b/t/yaz/GoogleBooks
@@ -1,5 +1,5 @@
 open localhost:9999/GOOGLEBOOKS
-find "Croatia"
+find @and @attr 1=4 "Krleža" @attr 1=1003 krleža
 show 1+3
 
 quit