--- trunk2/lib/WebPAC/Tree.pm	2004/11/01 15:29:17	573
+++ trunk2/lib/WebPAC/Tree.pm	2004/11/01 22:52:44	580
@@ -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");
 	},
+	nodes_dir => 'nodes',
  );
 
 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<nodes_dir> is relative path from output directory where tree nodes for
+iframes will be created.
+
 =cut
 
 sub new {
@@ -160,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'}) {
@@ -239,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");
 
@@ -294,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;
 
@@ -315,7 +328,7 @@
 
 			$log->debug("$code -> $v900 : $term [$mfn]");
 
-			my ($link_start,$link_end) = ('','');
+			my ($link_start,$link_end,$level_el) = ('','','ul');
 	
 			my $have_children = $tree->[$level]->{'have_children'}->($code,$v900);
 
@@ -326,13 +339,23 @@
 
 			}
 
-			($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');">};
+					$level_el = 'div';
+				}
+			}
 
 			my $mfn_link;
 			$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,14 +364,17 @@
 				$log->warn("file 'out/$mfn_link' doesn't exist, skipping");
 			}
 
+			# save mfn for iframe
+			push @{$self->{'mfn_arr'}}, $mfn;
+
 			unless ($have_children) {
 				next;
 			}
 			my $style = $tree->[$level]->{'style'};
 
 			$html .= " " x $level .
-				qq{<ul id="id$mfn"}.
-				($style ? ' style="'.$style.'"' : '').
+				qq{<$level_el id="id$mfn"}.
+				($style ? ' style="'.$style.';"' : '').
 				qq{>\n};
 
 			if ($style) {
@@ -362,16 +388,26 @@
 				push @{$self->{'show_ids'}}, "id$mfn";
 			}
 
-			if ($tree->[$level]->{'iframe'}) {
+
+			if ($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{<span id="w$mfn" style="display: none;">Učitavanje podataka...</span>\n};
+
+				$html .= " " x $level .
+				qq{<iframe id="i$mfn" name="i$mfn" width="100%" height="0" marginwidth="0" marginheight="0" frameborder="1" border="0" onLoad="iframe_resize(this.name);"></iframe>\n};
+				@{$self->{'iframe_mfn'}->{$mfn}} = @{$self->{'mfn_arr'}};
 
 			} else {
 				# unroll at base HTML
 				$html .= $self->unroll($next_level, $have_children, $base_path);
 			}
 
-			$html .= " " x $level . qq{</ul>\n};
+			$html .= " " x $level . qq{</$level_el>\n};
 
 		}
 	}
@@ -404,6 +440,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");