--- COBISS.pm	2009/06/20 19:42:00	5
+++ COBISS.pm	2010/10/22 21:31:08	14
@@ -5,7 +5,7 @@
 
 use WWW::Mechanize;
 use MARC::Record;
-use File::Slurp;
+use Data::Dump qw/dump/;
 
 binmode STDOUT, ':utf8';
 
@@ -17,7 +17,7 @@
 	},
 	 205  => { a => [  250 , 'a' ] },
 	 210  => {
-		a => [  250 , 'a' ],
+		a => [  260 , 'a' ],
 		c => [  260 , 'b' ],
 		d => [  260 , 'c' ],
 	},
@@ -64,11 +64,6 @@
 
 };
 
-sub usemap {
-	my $f = shift || die;
-	$usemap->{$f};
-}
-
 sub search {
 	my ( $self, $query ) = @_;
 
@@ -76,19 +71,19 @@
 
 	my $url = 'http://cobiss.izum.si/scripts/cobiss?ukaz=GETID&lani=en';
 
-diag "# get $url";
+diag "get $url";
 
 	$mech->get( $url );
 
-diag "# got session";
+diag "got session";
 
 	$mech->follow_link( text_regex => qr/union/ );
 
-diag "# switch to advanced form (select)";
+diag "switch to advanced form (select)";
 
 	$mech->follow_link( url_regex => qr/mode=3/ );
 
-diag "# submit search $query";
+diag "submit search $query";
 
 	$mech->submit_form(
 		fields => {
@@ -104,61 +99,101 @@
 		return;
 	}
 
-diag "# got $hits results, get first one";
+diag "got $hits results, get first one";
 
 	$mech->follow_link( url_regex => qr/ukaz=DISP/ );
 
-diag "# in COMARC format";
+diag "in COMARC format";
 
 	$mech->follow_link( url_regex => qr/fmt=13/ );
 }
 
 
-sub fetch_marc {
-	my ($self) = @_;
+sub fetch_rec {
+	my ($self,$format) = @_;
+
+	$format ||= 'unimarc';
+
+	die "unknown format: $format" unless $format =~ m{(uni|us)marc};
 
 	my $comarc;
 
-	if ( $mech->content =~ m{<pre>\s*(.+?(\d+\.)\s+ID=(\d+).+?)\s*</pre>}s ) {
+	if ( $mech->content =~ m{<pre>\s*(.+?(\d+)\.\s+ID=(\d+).+?)\s*</pre>}s ) {
 
 		my $comarc = $1;
 		my $nr = $2;
 		my $id = $3;
 
-diag "# fetch_marc $nr [$id]";
+diag "fetch_marc $nr [$id] $format";
 
 		$comarc =~ s{</?b>}{}gs;
 		$comarc =~ s{<font[^>]*>}{<s>}gs;
 		$comarc =~ s{</font>}{<e>}gs;
 
-		write_file "comarc/$id", $comarc;
+		open(my $out, '>:utf8', "comarc/$id");
+		print $out $comarc;
+		close($out);
 
 		print $comarc;
 
 		my $marc = MARC::Record->new;
 
 		foreach my $line ( split(/[\r\n]+/, $comarc) ) {
-			our @f;
 
 			if ( $line !~ s{^(\d\d\d)([01 ])([01 ])}{} ) {
 				diag "SKIP: $line";
 			} else {
+				our @f = ( $1, $2, $3 );
 				$line .= "<eol>";
 
-				@f = ( $1, $2, $3 );
-				sub sf { push @f, @_; }
-				$line =~ s{<s>(\w)<e>([^<]+)\s*}{sf($1, $2)}ges;
-				diag "# f:", join('|', @f), " left: |$line|";
-				$marc->add_fields( @f );
+				if ( $format eq 'unimarc' ) {
+
+					diag dump(@f), "line: $line";
+					sub sf_uni {
+						warn "sf ",dump(@_);
+						push @f, @_;
+					}
+					$line =~ s{<s>(\w)<e>([^<]+)\s*}{sf_uni($1, $2)}ges;
+					diag "f:", dump(@f), " left: |$line|";
+					$marc->add_fields( @f );
+
+				} elsif ( $format eq 'usmarc' ) {
+
+					my ( $f, $i1, $i2 ) = @f;
+
+					our $out = {};
+
+					sub sf_us {
+						my ($f,$sf,$v) = @_;
+						if ( my $m = $cobiss_marc21->{$f}->{$sf} ) {
+							push @{ $out->{ $m->[0] } }, ( $m->[1], $v );
+						}
+						return;
+					}
+					$line =~ s{<s>(\w)<e>([^<]+)\s*}{sf_us($f,$1, $2)}ges;
+
+					diag "converted marc21 ",dump( $out );
+
+					foreach my $f ( keys %$out ) {
+						$marc->add_fields( $f, $i1, $i2, @{ $out->{$f} } );
+					}
+				}
 			}
 		}
 
-		open(my $out, '>:utf8', "marc/$id");
+		my $path = "marc/$id.$format";
+
+		open($out, '>:utf8', $path);
 		print $out $marc->as_usmarc;
 		close($out);
 
+		diag "created $path ", -s $path, " bytes";
+
 		diag $marc->as_formatted;
 
+		$nr++;
+		$mech->follow_link( url_regex => qr/rec=$nr/ );
+
 		return $marc->as_usmarc;
 	} else {
 		die "can't fetch COMARC format from ", $mech->content;