--- trunk2/all2all.pl	2004/06/15 22:14:41	351
+++ trunk2/all2all.pl	2004/06/15 22:40:07	352
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-webpac.pl - basic script for all WebPac needs
+all2all.pl - basic script for all WebPac needs
 
 =cut
 
@@ -10,117 +10,49 @@
 use OpenIsis;
 use Text::Iconv;
 use Data::Dumper;
+use Carp;
 
-my $cp = Text::Iconv->new("852", "iso-8859-2");
+use lib './lib';
+use WebPac;
 
-$|=1;
-
-my $db = OpenIsis::open( shift @ARGV || '/data/hidra/THS-500/THS' );
-my $maxmfn = OpenIsis::maxRowid( $db ) || 1;
-
-print "rows: $maxmfn\n\n";
+my $webpac = new WebPac(
+	code_page => 'ISO-8859-2',
+) || die;
 
-my $data;
+$|=1;
 
-my @lookup = (
+print "reading database\n";
+my $maxmfn = $webpac->open_isis(
+	filename => shift @ARGV || '/data/hidra/THS-500/THS',
+	lookup => [
 	{ 'key' => 'd:v900', 'val' => 'v250^a' },
-	{ 'eval' => '"v901^a" eq "Područje"', 'key' => 'pa:v561^4:v562^4:v461^1', 'val' => 'v900' },
-	{ 'eval '=> '"v901^a" eq "Mikrotezaurus"', 'key' => 'ma:v561^4:v562^4:v461^1', 'val' => 'v900' },
-	{ 'eval' => '"v901^a" eq "Deskriptor"', 'key' => 'da:v561^4:v562^4:v461^1', 'val' => 'v900' },
+#	{ 'eval' => '"v901^a" eq "Područje"', 'key' => 'pa:v561^4:v562^4:v461^1', 'val' => 'v900' },
+#	{ 'eval '=> '"v901^a" eq "Mikrotezaurus"', 'key' => 'a:v561^4:v562^4:v461^1', 'val' => 'v900' },
+#	{ 'eval' => '"v901^a" eq "Deskriptor"', 'key' => 'a:v561^4:v562^4:v461^1', 'val' => 'v900' },
+	{ 'key' => 'a:v561^4:v562^4:v461^1', 'val' => 'v900' },
+	],
 );
 
-sub fill_in {
-	my $tmp = shift || return;
-	my $data = shift || return;
-	my $i = shift || 0;
-
-	my $found = 0;
-
-	sub get_sf {
-		my ($found,$data,$f,$sf,$i) = @_;
-		if ($$data->{$f} && $$data->{$f}->[$i]->{$sf}) {
-			$$found++;
-			return $$data->{$f}->[$i]->{$sf};
-		} else {
-			return '';
-		}
-	}
-
-	sub get_nosf {
-		my ($found,$data,$f,$i) = @_;
-		if ($$data->{$f} && $$data->{$f}->[$i]) {
-			$$found++;
-			return $$data->{$f}->[$i];
-		} else {
-			return '';
-		}
-	}
-
-	$tmp =~ s/v(\d+)\^(\w)/get_sf(\$found,\$data,$1,$2,$i)/ges;
-	$tmp =~ s/v(\d+)/get_nosf(\$found,\$data,$1,$i)/ges;
-
-	if ($found) {
-		return $tmp;
-	} else {
-		return;
-	}
-}
-
-print "reading database...\n";
+print "rows: $maxmfn\n\n";
 
 for (my $mfn = 1; $mfn <= $maxmfn; $mfn++) {
+	my $rec = $webpac->{'data'}->{$mfn} || die "no record with mfn $mfn";
 
-	my $row = OpenIsis::read( $db, $mfn );
-	foreach my $k (keys %{$row}) {
-		if ($k ne "mfn") {
-			foreach my $l (@{$row->{$k}}) {
-				$l = $cp->convert($l);
-				# has subfields?
-				my $val;
-				if ($l =~ m/\^/) {
-					foreach my $t (split(/\^/,$l)) {
-						next if (! $t);
-						$val->{substr($t,0,1)} = substr($t,1);
-					}
-				} else {
-					$val = $l;
-				}
-
-				push @{$data->{$mfn}->{$k}}, $val;
-			}
-		}
-
-	}
-
-
-	foreach my $i (@lookup) {
-		my $d = $data->{$mfn};
-		if ($i->{'eval'}) {
-			my $eval = fill_in($i->{'eval'},$d);
-			my $key = fill_in($i->{'key'}, $d);
-			my $val = fill_in($i->{'val'}, $d);
-			if ($key && $val && eval $eval) {
-				push @{$data->{lookup}->{$key}}, $val;
-			}
-		} else {
-			my $key = fill_in($i->{'key'}, $d);
-			my $val = fill_in($i->{'val'}, $d);
-			if ($key && $val) {
-				push @{$data->{lookup}->{$key}}, $val;
-			}
-		}
-	}
+	print "-- ",$webpac->fill_in($rec,'v250^a (v901^a)'),"\n";
 
-}
-print "\n";
+	my @t = $webpac->fill_in($rec,'v553^1;;v553^a');
+	print " Uži pojam: ",join("\t\n",@t),"\n" if (@t);
 
-for (my $mfn = 1; $mfn <= $maxmfn; $mfn++) {
-	my $d = $data->{$mfn};
-	print $d->{'250'}->[0]->{'a'},"\n";
-	my $t = fill_in('v553^1;;v553^a', $d);
-	print " Uži pojam: $t\n" if ($t);
-	$t = fill_in('[a:v251];;[d:[a:v251]]', $d);
-	print " Uži pojam: $t\n" if ($t);
+	@t = $webpac->fill_in($rec,'[a:v251::];;[d:[a:v251::]]');
+	@t = map { $webpac->lookup($_) => $_ } @t;
+	print " Područje: ",join("\t\n",@t),"\n" if (@t);
+
+	@t = $webpac->fill_in($rec,'[a:v561^4:v251:];;[d:[a:v561^4:v251:]]');
+	print " Mikrotezaurus: ",join("\t\n",@t),"\n" if (@t);
+
+	@t = $webpac->fill_in($rec,'[a:v561^4:v562^4:v900];;[d:[a:v561^4:v562^4:v900]]');
+	print " Deskriptor: ",join("\t\n",@t),"\n" if (@t);
 }
 
-print Dumper($data);
+print "## lookup ",Dumper($webpac->{'lookup'});
+print "## data ",Dumper($webpac->{'data'});