--- trunk2/lib/WebPAC/Tree.pm	2004/11/01 17:19:48	574
+++ trunk2/lib/WebPAC/Tree.pm	2004/11/01 18:00:26	575
@@ -133,7 +133,7 @@
 		my $path = "thes/${mfn}.html";
 		return $path if (-e "./out/$path");
 	},
-	iframe_base => '../',
+	nodes_dir => 'nodes',
  );
 
 C<tree> is tree array with levels of tree described above.
@@ -144,8 +144,8 @@
 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).
+C<nodes_dir> is relative path from output directory where tree nodes for
+iframes will be created.
 
 =cut
 
@@ -164,6 +164,15 @@
 	$self->{'show_ids'} = [];
 	$self->{'hide_ids'} = [];
 
+	# figure out relative URL to other content from nodes_dir
+	my $iframe_base = $self->{'nodes_dir'};
+	if ($iframe_base) {
+		$iframe_base = s#[^/]*##g;
+		$iframe_base = '../' x ( length($iframe_base) );
+		$self->{'iframe_base'} = $iframe_base;
+		$log->debug("nodes dir is '",$self->{'nodes_dir'},"' so iframe_base is '",$self->{'iframe_base'},"'");
+	}
+
 	$self->{'tree_html'} = $self->unroll(0,());
 
 	if (! $self->{'tree_html'}) {
@@ -184,7 +193,6 @@
 	template_dir => './output_template/',
 	template_tree => 'tree.tt',
 	template_node => 'node.tt',
-	nodes => 'nodes',
 	js => 'tree-ids.js',
  );
 
@@ -200,9 +208,6 @@
 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
@@ -247,14 +252,14 @@
 		file => $js_file,
 	);
 
-	if (! $args->{'nodes'}) {
+	if (! $self->{'nodes_dir'}) {
 		$log->warn("skipping node creation");
 		return $self;
 	}
 
 	foreach my $mfn (keys %{$self->{'node_html'}}) {
 
-		my $html_file = $args->{'dir'}."/".$args->{'nodes'}."/${mfn}.html";
+		my $html_file = $args->{'dir'}."/".$self->{'nodes_dir'}."/${mfn}.html";
 
 		$log->debug("creating tree node $html_file");
 
@@ -302,7 +307,7 @@
 	# all levels passed?
 	return if (! defined($tree->[$level]));
 
-	$log->debug("unroll level $level");
+	$log->debug("unroll level $level base path ",($base_path || "none")); 
 
 	my $html;
 
@@ -334,7 +339,16 @@
 
 			}
 
-			($link_start,$link_end) = (qq{<a href="#mfn$mfn" onClick="return toggle_display('id$mfn');">},qq{</a>}) if ($have_children);
+			my $iframe = $tree->[$level]->{'iframe'};
+
+			if ($have_children) {
+				($link_start,$link_end) = (qq{<a href="#mfn$mfn" onClick="return toggle_display('id$mfn');">},qq{</a>});
+				if ($iframe) {
+					my $url = $self->{'nodes_dir'} || $log->logdie("no nodes_dir?");
+					$url .= "/${mfn}.html";
+					$link_start = qq{<a href="#mfn$mfn" onClick="iframe_load('i$mfn','$url'); return toggle_display('id$mfn');">};
+				}
+			}
 
 			my $mfn_link;
 			$mfn_link = $self->{'detail_url'}->($mfn) if ($self->{'detail_url'});
@@ -374,7 +388,7 @@
 			}
 
 
-			if ($tree->[$level]->{'iframe'}) {
+			if ($iframe) {
 
 				# reset list of current mfns
 				$self->{'mfn_arr'} = ();
@@ -382,9 +396,8 @@
 				# unroll to separate file
 				$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>};
+				qq{<iframe id="i$mfn" name="i$mfn" width="100%" height="0" frameborder="0" border="0" onLoad="iframe_resize(this.name);"></iframe>};
 				@{$self->{'iframe_mfn'}->{$mfn}} = @{$self->{'mfn_arr'}};
-				$log->debug("in this iframe: ", sub { Dump($self->{'iframe_mfn'}->{$mfn}) });
 
 			} else {
 				# unroll at base HTML
@@ -427,7 +440,7 @@
 
 	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 " ",join(",",map { "[$_:$if]" } @{$self->{'iframe_mfn'}->{$if}}),",\n";
 	}
 	print JS " null\n]\n";