move save_marc to Scraper

[Biblio-Z3950.git] / Aleph.pm

diff --git a/Aleph.pm b/Aleph.pm
index 3fde6be..4c27f5a 100644 (file)
--- a/Aleph.pm
+++ b/Aleph.pm
@@ -9,7 +9,7 @@ use Data::Dump qw/dump/;
 use base 'Scraper';
 
 sub diag {
-       print "# ", @_, $/;
+       warn "# ", @_, $/;
 }
 
 # Koha Z39.50 query:
@@ -86,7 +86,7 @@ diag "submit search $query";
        );
 
        my $hits = 0;
-       if ( $mech->content =~ m{ukupno\s+(\d+).*(do\s+(\d+))}s ) {
+       if ( $mech->content =~ m{ukupno\s+(\d+).*do\s+(\d+)}s ) {
                $hits = $1;
                $hits = $2 if $2 && $2 < $1; # correct for max. results
        } else {
@@ -106,9 +106,13 @@ diag "in MARC format";
 }
 
 
+our ( $hash, $marc );
+
 sub next_marc {
        my ($self,$format) = @_;
 
+       $format ||= 'marc';
+
        my $mech = $self->{mech} || die "no mech?";
 
 print $mech->content;
@@ -119,10 +123,10 @@ print $mech->content;
 
 diag "parse $nr";
 
-               my $marc = MARC::Record->new;
+               $marc = MARC::Record->new;
+               $hash = {};
 
                my $html = $mech->content;
-               my $hash;
 
                sub field {
                        my ( $f, $v ) = @_;
@@ -139,24 +143,14 @@ diag "sf = ", dump(@sf);
                }
 
                $html =~ s|<tr>\s*<td class=td1 id=bold[^>]*>(.+?)</td>\s*<td class=td1>(.+?)</td>|field($1,$2)|ges;
-               diag dump($hash);
+               diag "# hash ",dump($hash);
 
                my $id = $hash->{SYS} || die "no SYS";
 
-               my $path = "marc/$id.$format";
-
-               open(my $out, '>:utf8', $path);
-               print $out $marc->as_usmarc;
-               close($out);
-
-               diag "created $path ", -s $path, " bytes";
-
-#              diag $marc->as_formatted;
+               $self->save_marc( $id, $marc->as_usmarc );
 
                $nr++;
 
-               die if $nr == 3; # FIXME
-
                $mech->follow_link( url_regex => qr/set_entry=0*$nr/ );
 
                return $marc->as_usmarc;