--- trunk2/all2all.pl	2004/11/01 15:29:17	573
+++ trunk2/all2all.pl	2004/11/06 21:00:14	587
@@ -178,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+$//;
@@ -195,7 +195,7 @@
 			#path => $f,
 			path => $webpac->mfn,
 			headline => $h,
-			words => unac($words),
+			words => $words,
 		);
 	}
 
@@ -276,6 +276,7 @@
 				return(9, $l->{"a:$code:"} ) if (defined($l->{"a:$code:"}));
 			},
 	style		=> 'display: none',
+	iframe		=> 1,
 	},{
 	# 1
 	code_arr	=> sub { @{$_[0]} },
@@ -285,7 +286,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]} },
@@ -360,9 +360,10 @@
 	tree => \@tree,
 	detail_url => sub {
 		my $mfn = shift;
-		my $url = "./out/thes/${mfn}.html";
-		return $url if (-e $url);
+		my $url = "thes/${mfn}.html";
+		return $url if (-e "./out/$url");
 	},
+	nodes_dir => 'nodes',
 );
 
 $tree->output(
@@ -371,7 +372,6 @@
 	template_dir => './output_template/',
 	template_tree => 'tree.tt',
 	template_node => 'node.tt',
-	nodes => 'nodes',
 	js => 'tree-ids.js',
 );
 
@@ -381,7 +381,6 @@
 	template_dir => './output_template/',
 	template_tree => 'hijerarhija.tt',
 	template_node => 'hijerarhija_node.tt',
-	nodes => 'nodes',
 	js => 'tree-ids.js',
 );