--- trunk2/all2all.pl	2004/09/23 23:17:42	466
+++ trunk2/all2all.pl	2004/10/10 17:21:17	503
@@ -7,6 +7,7 @@
 =cut
 
 use strict;
+use locale;
 use YAML;
 use Carp;
 use Getopt::Long;
@@ -31,6 +32,20 @@
 	"low_mem!"	=> \$low_mem,
 );
 
+my $filter = {
+	'CROVOC' => sub {
+		my $tmp = shift || return;
+		return undef unless ($tmp =~ s/\s*CROVOC.*$/ */);
+		return $tmp;
+	},
+	'CROVOC_tree' => sub {
+		my $tmp = shift || return;
+		$tmp =~ s/\s*CROVOC.*$/ */;
+		$tmp =~ s/\s*EUROVOC.*//;
+		return $tmp;
+	},
+};
+
 # create WebPAC object
 #
 my $webpac = new WebPAC(
@@ -39,6 +54,7 @@
 	start_mfn => $start_mfn,
 	debug => $debug,
 	low_mem => $low_mem,
+	filter => $filter,
 ) || die;
 
 my $log = $webpac->_get_logger() || die "can't get logger";
@@ -57,14 +73,14 @@
 my $maxmfn = $webpac->open_isis(
 	filename => shift @ARGV || '/data/hidra/THS/THS',
 	lookup => [
-	{ 'key' => 'd:v900', 'val' => 'v250^a' },
+	{ 'key' => 'd:v900', 'val' => 'filter{CROVOC_tree}v250^a v800' },
 #	{ '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' },
 	{ 'key' => '900_mfn:v900', 'val' => 'v000' },
 	# tree structure
-	{ 'eval' => 'length("v251") == 2', 'key' => 'root:v251', 'val' => 'v900' },
+	{ 'eval' => 'length("v251") == 2 && "v800" =~ m/EUROVOC/ || "v800" =~ m/CROVOC/ && "v251" =~ m/^(H|HD|L|Z|P)$/', 'key' => 'root:v251', 'val' => 'v900' },
 	{ 'eval' => '"v251"', 'key' => 'code:v900', 'val' => 'v561^4:v251' },
 	{ 'eval' => '"v561^4" && "v562^4"', 'key' => 'code:v900', 'val' => 'v561^4:v562^4' },
 	],
@@ -200,9 +216,11 @@
 	lookup_mfn	=> sub { shift @{$l->{"900_mfn:".$_[1]}} },
 	have_children	=> sub { return $l->{"a:".$_[0]."::"} },
 	have_children_at_level => sub {
-				my $l2 = shift;
-				my $l1 = substr($l2,0,1);
-				return(9, "a:$l1:$l2:" ) if ($l->{"a:$l1:$l2"});
+				return unless (defined($l->{"code:".$_[1]}));
+				my $code = shift @{$l->{"code:".$_[1]}};
+				print STDERR "## $_[1] -> $code\n";
+				return undef unless($code);
+				return(9, $l->{"a:$code:"} ) if (defined($l->{"a:$code:"}));
 			},
 	style		=> 'display: none',
 	},{
@@ -274,13 +292,13 @@
 	have_children	=> sub { 0 },
 	},{
 	# 9 - level which is never reached except explicitly
-	code_arr	=> sub { @{$l->{$_[0]}} },
+	code_arr	=> sub { @{$_[0]} },
 	filter_code	=> sub { shift },
 	lookup_v900	=> sub { shift @{$l->{"code:".$_[0]}} },
 	lookup_term	=> sub { shift @{$l->{"d:".$_[0]}} },
 	lookup_mfn	=> sub { shift @{$l->{"900_mfn:".$_[0]}} },
 	have_children	=> sub { 0 },
-	have_children_at_level => sub { defined($l->{"a:".$_[1].":".$_[0]}) && return (9,"a:".$_[1].":".$_[0]) },
+	have_children_at_level => sub { defined($l->{"a:".$_[1].":".$_[0]}) && return (9,$l->{"a:".$_[1].":".$_[0]}) },
 	},{
 });