projects
/
Biblio-Z3950.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we need english stemmer because remote database is configured wrong
[Biblio-Z3950.git]
/
server.pl
diff --git
a/server.pl
b/server.pl
index
cb710be
..
7b02608
100755
(executable)
--- a/
server.pl
+++ b/
server.pl
@@
-6,9
+6,13
@@
use strict;
use Net::Z3950::SimpleServer;
use Net::Z3950::OID;
use Data::Dumper;
use Net::Z3950::SimpleServer;
use Net::Z3950::OID;
use Data::Dumper;
-use COBISS;
+
#
use COBISS;
use Aleph;
use GoogleBooks;
use Aleph;
use GoogleBooks;
+use vuFind;
+use DPLA;
+use AlephTR;
+use CROSBI;
use Encode;
use Encode;
@@
-19,6
+23,14
@@
my $databases = {
'NSK10' => 'Aleph',
'ZAG01' => 'Aleph',
'GOOGLEBOOKS' => 'GoogleBooks',
'NSK10' => 'Aleph',
'ZAG01' => 'Aleph',
'GOOGLEBOOKS' => 'GoogleBooks',
+ 'HATHITRUST' => 'vuFind',
+ 'DPLA' => 'DPLA',
+ 'MKUTUP' => 'AlephTR',
+ 'CROSBI' => 'CROSBI',
+ 'CROSBI-CASOPIS' => 'CROSBI',
+ 'CROSBI-PREPRINT' => 'CROSBI',
+ 'CROSBI-RKNJIGA' => 'CROSBI',
+ 'CROSBI-ZBORNIK' => 'CROSBI',
};
my $max_records = 10; # XXX configure this
};
my $max_records = 10; # XXX configure this
@@
-60,7
+72,7
@@
diag "SearchHandle ",Dumper($self);
diag "using $module for $database ", Dumper( $from );
eval { $query = $rpn->{query}->render( $from->usemap ); };
diag "using $module for $database ", Dumper( $from );
eval { $query = $rpn->{query}->render( $from->usemap ); };
- warn "ERROR:
$@"
if $@;
+ warn "ERROR:
", Dumper($@)
if $@;
if ( $@ && ref($@) ) { ## Did someone/something report any errors?
$self->{ERR_CODE} = $@->{errcode};
$self->{ERR_STR} = $@->{errstr};
if ( $@ && ref($@) ) { ## Did someone/something report any errors?
$self->{ERR_CODE} = $@->{errcode};
$self->{ERR_STR} = $@->{errstr};
@@
-145,7
+157,9
@@
sub FetchHandle {
my $from = $rs->{from} || die "no from?";
# fetch records up to offset
while( $#{ $rs->{results} } < $offset ) {
my $from = $rs->{from} || die "no from?";
# fetch records up to offset
while( $#{ $rs->{results} } < $offset ) {
- push @{ $rs->{results} }, $from->next_marc;
+ my $marc = $from->next_marc;
+ last if ! $marc; # abort results
+ push @{ $rs->{results} }, $marc;
warn "# rs result ", $#{ $rs->{results} },"\n";
}
warn "# rs result ", $#{ $rs->{results} },"\n";
}
@@
-193,27
+207,32
@@
package Net::Z3950::RPN::And;
sub render {
my ($self,$usemap) = @_;
sub render {
my ($self,$usemap) = @_;
- return $self->[0]->render($usemap) . ' AND ' . $self->[1]->render($usemap);
+ return $self->[0]->render($usemap)
+ . ( $usemap->{RPN}->{And} || ' AND ' )
+ . $self->[1]->render($usemap);
}
package Net::Z3950::RPN::Or;
sub render {
my ($self,$usemap) = @_;
}
package Net::Z3950::RPN::Or;
sub render {
my ($self,$usemap) = @_;
- return $self->[0]->render($usemap) . ' OR ' . $self->[1]->render($usemap);
+ return $self->[0]->render($usemap)
+ . ( $usemap->{RPN}->{Or} || ' OR ' )
+ . $self->[1]->render($usemap);
}
package Net::Z3950::RPN::AndNot;
sub render {
my ($self,$usemap) = @_;
}
package Net::Z3950::RPN::AndNot;
sub render {
my ($self,$usemap) = @_;
- return $self->[0]->render($usemap) . ' AND NOT ' . $self->[1]->render($usemap);
+ return $self->[0]->render($usemap)
+ . ( $usemap->{RPN}->{Or} || ' AND NOT ' )
+ . $self->[1]->render($usemap);
}
package Net::Z3950::RPN::Term;
use Data::Dump qw(dump);
}
package Net::Z3950::RPN::Term;
use Data::Dump qw(dump);
-use COBISS;
sub render {
my ($self,$usemap) = @_;
sub render {
my ($self,$usemap) = @_;
@@
-257,19
+276,24
@@
warn "# usemap ", dump($usemap);
}
}
if ( defined( $attributes->{5} ) ) { ## No truncation
}
}
if ( defined( $attributes->{5} ) ) { ## No truncation
- die { errcode => 113, errstr => 5 };
+# die { errcode => 113, errstr => 5 };
+ warn "# truncation is ignored";
}
my $comp = $attributes->{6};
if ($prefix) {
if ( defined($comp) && ( $comp >= 2 ) ) {
}
my $comp = $attributes->{6};
if ($prefix) {
if ( defined($comp) && ( $comp >= 2 ) ) {
- $prefix = "all$prefix= ";
- }
- else {
- $prefix = "$prefix=";
+ $prefix = "all$prefix"; # FIXME?
}
}
}
}
- my $q = $prefix . $self->{term} . '*';
+ my $q;
+
+ if ( $usemap->{prefix_term} ) {
+ warn "# using custom prefix_term query";
+ $q = $usemap->{prefix_term}->( $prefix, $self->{term} );
+ } else {
+ $q = $prefix . $self->{term} . '*';
+ }
print "# q: $q\n";
return $q;
}
print "# q: $q\n";
return $q;
}