--- trunk2/all2all.pl	2004/11/01 18:00:26	575
+++ trunk2/all2all.pl	2004/11/06 22:46:30	591
@@ -128,6 +128,7 @@
 	{ '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' },
+	{ 'key' => 'crovoc:v900', 'val' => 'filter{CROVOC}v800' },
 	],
 );
 
@@ -178,7 +179,7 @@
 
 		# strip all non word characters from beginning or end
 		# of word
-		my $words = join(" ",@{$ds->{'swish'}});
+		my $words = unac(join(" ",@{$ds->{'swish'}}));
 		$words =~ s/^\W+//;
 		$words =~ s/\W*\s+\W*/ /g;
 		$words =~ s/\W+$//;
@@ -195,7 +196,7 @@
 			#path => $f,
 			path => $webpac->mfn,
 			headline => $h,
-			words => unac($words),
+			words => $words,
 		);
 	}
 
@@ -276,6 +277,7 @@
 				return(9, $l->{"a:$code:"} ) if (defined($l->{"a:$code:"}));
 			},
 	style		=> 'display: none',
+	iframe		=> 1,
 	},{
 	# 1
 	code_arr	=> sub { @{$_[0]} },
@@ -285,7 +287,6 @@
 	lookup_mfn	=> sub { shift @{$l->{"900_mfn:".$_[0]}} },
 	have_children	=> sub { return $l->{"a:".$_[1].":"} },
 	style		=> 'display: none',
-	iframe		=> 1,
 	},{
 	# 2
 	code_arr	=> sub { @{$_[0]} },