X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=server.pl;h=58235491b63d90f339c1b5beb5ad84e7033b94b0;hb=e8bb9d46a481147e13d8fa2ae1716e439022e74b;hp=693ce186d4eb0c8d3ec6d6d44ceeed0beabe51c1;hpb=7ae517508971c0ba1b2cb0a9051fe166dc31b7f2;p=Biblio-Z3950.git

diff --git a/server.pl b/server.pl
index 693ce18..5823549 100755
--- a/server.pl
+++ b/server.pl
@@ -6,18 +6,26 @@ use strict;
 use Net::Z3950::SimpleServer;
 use Net::Z3950::OID;
 use Data::Dumper;
-use COBISS;
+#use COBISS;
 use Aleph;
+use GoogleBooks;
+use vuFind;
+use DPLA;
+
 use Encode;
 
+# databases names (left) must be in uppercase!
 my $databases = {
-	'COBISS' => 'COBISS',
+#	'COBISS' => 'COBISS',
 	'NSK01'  => 'Aleph',
 	'NSK10'  => 'Aleph',
 	'ZAG01'  => 'Aleph',
+	'GOOGLEBOOKS' => 'GoogleBooks',
+	'HATHITRUST' => 'vuFind',
+	'DPLA'   => 'DPLA',
 };
 
-my $max_records = 3; # XXX configure this
+my $max_records = 10; # XXX configure this
 my $max_result_sets = 10;
 
 sub diag {
@@ -127,7 +135,7 @@ sub FetchHandle {
 		$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";
@@ -141,7 +149,9 @@ sub FetchHandle {
 	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";
 	}
 
@@ -189,27 +199,32 @@ package Net::Z3950::RPN::And;
 
 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) = @_;
-    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) = @_;
-    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);
-use COBISS;
 
 sub render {
 	my ($self,$usemap) = @_;
@@ -258,14 +273,18 @@ warn "# usemap ", dump($usemap);
     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;
 }