--- trunk2/all2all.pl	2004/10/26 20:53:03	549
+++ trunk2/all2all.pl	2004/11/06 21:00:14	587
@@ -36,15 +36,27 @@
 my $filter = {
 	'CROVOC' => sub {
 		my $tmp = shift || return;
-		return undef unless ($tmp =~ s/\s*CROVOC.*$/ */);
+		$tmp =~ s/\s*HIDRA.*//;
+		return undef unless ($tmp =~ s/\s*CROVOC.*$/ #C#/);
+		# remove repeating stars
+		# FIXME this should be fixed at right place, not here!
+		$tmp =~ s/(\s*#C#)+/ #C#/g;
 		return $tmp;
 	},
 	'CROVOC_tree' => sub {
 		my $tmp = shift || return;
-		$tmp =~ s/\s*CROVOC.*$/ */;
+		$tmp =~ s/\s*CROVOC.*$/ <img src="img\/crovoc.png" border="0">/;
 		$tmp =~ s/\s*EUROVOC.*//;
+		$tmp =~ s/\s*HIDRA.*//;
 		return $tmp;
 	},
+	# TT filter
+	'CROVOC_img' => sub {
+		my $tmp = shift;
+		$tmp =~ s/\s*#C#\s*/ <img src="..\/img\/crovoc.png" border="0">/gis;
+		$tmp =~ s/"img\/crovoc.png"/"..\/img\/crovoc.png"/gis;
+		return $tmp;
+	}
 };
 
 ## remove accented characters
@@ -53,6 +65,7 @@
 	my $string = shift || return;
 	$string = unac_string($code_page,$string);
 	$string =~ tr/ðÐ/dD/;
+	$string = unac_entities($string);
 	return $string;
 }
 sub unac_2 {
@@ -63,13 +76,21 @@
 		$string =~ tr/ðÐ/dD/;
 		$string = $pr . $string;
 	}
-	$string =~ s/&(\w)(acute|cedil|circ|grave|ring|slash|tilde|uml);/$1/gi;
-	$string =~ s/&eth;/d/g;
-	$string =~ s/&E[tT][hH];/D/g;
-	$string =~ s/&(\w\w)lig;/$1/gi;
+	$string = unac_entities($string);
 	return lc($string);
 }
 
+sub unac_entities {
+	my $ent = shift || return;
+
+	$ent =~ s/&(\w)(acute|cedil|circ|grave|ring|slash|tilde|uml);/$1/gi;
+	$ent =~ s/&eth;/d/g;
+	$ent =~ s/&E[tT][hH];/D/g;
+	$ent =~ s/&(\w\w)lig;/$1/gi;
+
+	return $ent;
+}
+
 # create WebPAC object
 #
 my $webpac = new WebPAC(
@@ -87,7 +108,7 @@
 
 my $index = new WebPAC::jsFind(
 	index_path => $index_path,
-	keys => 10,
+	keys => 62,
 ) || die;
 
 my $thes;
@@ -157,7 +178,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+$//;
@@ -174,7 +195,7 @@
 			#path => $f,
 			path => $webpac->mfn,
 			headline => $h,
-			words => unac($words),
+			words => $words,
 		);
 	}
 
@@ -255,6 +276,7 @@
 				return(9, $l->{"a:$code:"} ) if (defined($l->{"a:$code:"}));
 			},
 	style		=> 'display: none',
+	iframe		=> 1,
 	},{
 	# 1
 	code_arr	=> sub { @{$_[0]} },
@@ -272,7 +294,7 @@
 	lookup_term	=> sub { shift @{$l->{"d:".$_[0]}} },
 	lookup_mfn	=> sub { shift @{$l->{"900_mfn:".$_[0]}} },
 	have_children	=> sub { return $l->{"a:".$_[1].":".$_[0]} },
-	#style		=> 'display: none',
+	style		=> 'display: none',
 	},{
 	# 3 u¾i pojam
 	code_arr	=> sub { @{$_[0]} },
@@ -336,19 +358,29 @@
 
 my $tree = new WebPAC::Tree(
 	tree => \@tree,
+	detail_url => sub {
+		my $mfn = shift;
+		my $url = "thes/${mfn}.html";
+		return $url if (-e "./out/$url");
+	},
+	nodes_dir => 'nodes',
 );
 
 $tree->output(
 	dir => './out',
 	html => 'browse.html',
-	template => './output_template/tree.tt',
+	template_dir => './output_template/',
+	template_tree => 'tree.tt',
+	template_node => 'node.tt',
 	js => 'tree-ids.js',
 );
 
 $tree->output(
  	dir => './eurovoc',
  	html => 'hijerarhija.html',
-	template => './output_template/hijerarhija.tt',
+	template_dir => './output_template/',
+	template_tree => 'hijerarhija.tt',
+	template_node => 'hijerarhija_node.tt',
 	js => 'tree-ids.js',
 );