X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=Aleph.pm;h=8fdb1deb4061e87c3c4591000ed6fcee2cfadab4;hb=e3ce1e2363cba4e007d3159d969b2e319032eaf2;hp=b9377287e94fb765300d2a4cd2e03068283a9dc9;hpb=9469ebef14d840f04454de4116db2cc3cf170e8a;p=Biblio-Z3950.git

diff --git a/Aleph.pm b/Aleph.pm
index b937728..8fdb1de 100644
--- a/Aleph.pm
+++ b/Aleph.pm
@@ -59,13 +59,16 @@ sub usemap {{
 #	1016	=> '',
 }};
 
+our $session_id;
 
 sub search {
 	my ( $self, $query ) = @_;
 
 	die "need query" unless defined $query;
 
-	my $url = 'http://161.53.240.197:8991/F?RN=' . int rand(1000000000);
+	$session_id ||= int rand(1000000000);
+	# FIXME allocate session just once
+	my $url = 'http://161.53.240.197:8991/F?RN=' . $session_id;
 	# fake JavaScript code on page which creates random session
 
 diag "get $url";
@@ -77,7 +80,18 @@ diag "advanced search";
 
 	$mech->follow_link( url_regex => qr/find-c/ );
 
-diag "submit search $query";
+	my $database = $self->{database};
+
+	if ( $mech->content =~ m{Requested library is unavailable at the moment} ) {
+		warn "ERROR: default database not available, try to swith to $database\n";
+		$self->save_content;
+		$mech->follow_link( url_regex => qr/local_base=$database/i );
+		diag "re-try advanced search";
+		$mech->follow_link( url_regex => qr/find-c/ );
+	}
+
+diag "submit search [$query] on ", $self->{database};
+
 
 	$mech->submit_form(
 		fields => {
@@ -103,7 +117,7 @@ diag "in MARC format";
 
 	$mech->follow_link( url_regex => qr/format=001/ );
 
-	return $hits;
+	return $self->{hits} = $hits;
 }
 
 
@@ -132,6 +146,7 @@ warn "parse $nr";
 		sub field {
 			my ( $f, $v ) = @_;
 			$v =~ s/\Q \E/ /gs;
+			$v =~ s/\s+$//gs;
 warn "## $f\t$v\n";
 			$hash->{$f} = $v;
 
@@ -168,9 +183,11 @@ warn "## ++ ", dump( $f, $i1, $i2, @sf );
 
 		$self->save_marc( $id, $marc->as_usmarc );
 
-		$nr++;
-
-		$mech->follow_link( url_regex => qr/set_entry=0*$nr/ );
+		if ( $nr < $self->{hits} ) {
+			$nr++;
+			diag "follow link to next record $nr";
+			$mech->follow_link( url_regex => qr/set_entry=0*$nr/ );
+		}
 
 		return $marc->as_usmarc;
 	} else {