--- trunk2/lib/WebPAC/Tree.pm	2004/09/24 18:04:48	469
+++ trunk2/lib/WebPAC/Tree.pm	2004/09/26 16:44:23	472
@@ -158,6 +158,8 @@
 
 	my $html = $self->unroll(0,());
 
+	$log->logdie("no html generated by unroll...") unless ($html);
+
 	my $html_file = $self->{'dir'}.'/'.$self->{'html'};
 
 	open(TEMPLATE, $self->{'template'}) || $log->logdie("can't open '",$self->{'template'},": $!");
@@ -227,15 +229,15 @@
 			my $v900 = $tree->[$level]->{'lookup_v900'}->($code) || $log->warn("can't lookup_v900($code)") && return;
 			$log->debug("# $level lookup_v900($code) = $v900");
 
-			my $term = $tree->[$level]->{'lookup_term'}->($code,$v900) || $log->warn("can't lookup_term($code,$v900)") && return;
+			my $term = $tree->[$level]->{'lookup_term'}->($code,$v900) || $log->warn("can't lookup_term($code,$v900)") && next;
 			$log->debug("# $level lookup_term($code,$v900) = $term");
 
-			my $mfn  = $tree->[$level]->{'lookup_mfn'}->($code,$v900)  || $log->warn("can't lookup_mfn($code,$v900)") && return;
+			my $mfn  = $tree->[$level]->{'lookup_mfn'}->($code,$v900)  || $log->warn("can't lookup_mfn($code,$v900)") && next;
 			$log->debug("# $level lookup_mfn($code,$v900) = $mfn");
 
 			$log->debug("$code -> $v900 : $term [$mfn]");
 
-			my ($link_start,$link_end) = ('<a name="mfn'.$mfn.'"></a>','');
+			my ($link_start,$link_end) = ('','');
 	
 			my $have_children = $tree->[$level]->{'have_children'}->($code,$v900);
 
@@ -251,8 +253,8 @@
 			my $mfn_link = "thes/$mfn.html";
 			if (-e "out/$mfn_link") {
 				$html .= " " x $level .
-					qq{<li>${link_start}<span id="o$mfn">${term}</span>${link_end}}.
-					qq{&nbsp;<a href="$mfn_link">&raquo;</a></li>\n};
+					qq{<li><a name="mfn${mfn}"></a>${link_start}<span id="o$mfn">${term}</span>${link_end}}.
+					qq{&nbsp;<a href="$mfn_link" onClick="javascript:return popup(this);">&raquo;</a></li>\n};
 			} else {
 				$log->warn("file 'out/$mfn_link' doesn't exist, skipping");
 			}
@@ -263,7 +265,7 @@
 			my $style = $tree->[$level]->{'style'};
 
 			$html .= " " x $level .
-				qq{<a name="mfn$mfn"></a>\n <ul id="id$mfn"}.
+				qq{<ul id="id$mfn"}.
 				($style ? ' style="'.$style.'"' : '').
 				qq{>\n};