--- trunk2/lib/WebPAC/Tree.pm	2004/11/01 15:29:17	573
+++ trunk2/lib/WebPAC/Tree.pm	2004/11/01 17:19:48	574
@@ -130,9 +130,10 @@
  	log => 'log4perl.conf',
 	detail_url => sub {
 		my $mfn = shift;
-		my $path = "./out/thes/${mfn}.html";
-		return $path if (-e $path);
+		my $path = "thes/${mfn}.html";
+		return $path if (-e "./out/$path");
 	},
+	iframe_base => '../',
  );
 
 C<tree> is tree array with levels of tree described above.
@@ -143,6 +144,9 @@
 C<detail_url> code ref to check if detail html exists (and return URL if
 it does).
 
+C<iframe_base> is relative path from C<dir> defiend in C<output> to root
+(which is inserted in all html).
+
 =cut
 
 sub new {
@@ -180,6 +184,7 @@
 	template_dir => './output_template/',
 	template_tree => 'tree.tt',
 	template_node => 'node.tt',
+	nodes => 'nodes',
 	js => 'tree-ids.js',
  );
 
@@ -195,6 +200,9 @@
 C<template_node> is (optional) name of template for node (if C<iframe>
 options is used within tree definition).
 
+C<nodes> is directory in C<dir> in which html for iframes will be located.
+See also C<iframe_base> for relative dir out of this directory.
+
 C<js> is name of JavaScript file with shown and hidden ids.
 
 =cut
@@ -332,7 +340,7 @@
 			$mfn_link = $self->{'detail_url'}->($mfn) if ($self->{'detail_url'});
 
 			if ($mfn_link) {
-				$term =~ s, *#C# *, <img src="${base_path}img/crovoc.png" border="0">,;
+				$term =~ s/ *#C# */ <img src="${base_path}img\/crovoc.png" border="0">/;
 				$html .= " " x $level .
 					qq{<li>${link_start}<span id="o$mfn">${term}</span>${link_end}}.
 					qq{&nbsp;<a href="${base_path}${mfn_link}" onClick="javascript:return popup(this);"><img src="${base_path}img/listic.png" border="0"></a></li>\n};
@@ -341,6 +349,9 @@
 				$log->warn("file 'out/$mfn_link' doesn't exist, skipping");
 			}
 
+			# save mfn for iframe
+			push @{$self->{'mfn_arr'}}, $mfn;
+
 			unless ($have_children) {
 				next;
 			}
@@ -362,9 +373,18 @@
 				push @{$self->{'show_ids'}}, "id$mfn";
 			}
 
+
 			if ($tree->[$level]->{'iframe'}) {
+
+				# reset list of current mfns
+				$self->{'mfn_arr'} = ();
+
 				# unroll to separate file
-				$self->{'node_html'}->{$mfn} = $self->unroll($next_level, $have_children, '../');
+				$self->{'node_html'}->{$mfn} = $self->unroll($next_level, $have_children, $self->{'iframe_base'});
+				$html .= " " x $level .
+				qq{<iframe id="i$mfn" name="i$mfn" width="100%" height="10" frameborder="0" border="0"></iframe>};
+				@{$self->{'iframe_mfn'}->{$mfn}} = @{$self->{'mfn_arr'}};
+				$log->debug("in this iframe: ", sub { Dump($self->{'iframe_mfn'}->{$mfn}) });
 
 			} else {
 				# unroll at base HTML
@@ -404,6 +424,13 @@
 	open(JS, ">", $js_file) || $log->logdie("can't open '$js_file': $!");
 	print JS "var show = ['",join("','",@{$self->{'show_ids'}}),"'];\n";
 	print JS "var hide = ['",join("','",@{$self->{'hide_ids'}}),"'];\n";
+
+	print JS "var mfn_iframe = [\n";
+	foreach my $if (keys %{$self->{'iframe_mfn'}}) {
+		print JS " ",join(",",map { "[$_:$if]" } @{$self->{'iframe_mfn'}->{$if}}),",\n";
+	}
+	print JS " null\n]\n";
+
 	close(JS);
 
 	$log->debug("stored ",scalar @{$self->{'show_ids'}}," shown and ",scalar @{$self->{'hide_ids'}}," hidden elements");