--- trunk2/all2all.pl 2004/09/14 09:23:00 440
+++ trunk2/all2all.pl 2004/09/14 17:07:59 441
@@ -15,6 +15,7 @@
use WebPAC;
use WebPAC::jsFind;
use WebPAC::Index;
+use WebPAC::Tree;
# options which can be changed via command line
#
@@ -170,54 +171,12 @@
$log->debug("lookup hash: ",Dumper($webpac->{'lookup'}));
+$log->info("creating tree");
+
#
-# tree dump implementation which shouldn't be here :-)
+# define tree structure
#
-
-my $file = 'out/browse.html';
-my $js_url = 'tree-ids.js';
-
-$log->info("creating '$file' for tree html");
-open(HTML, "> $file") || $log->logdie("can't open '$file'");
-
-print HTML qq{
-
-
- Browse
-
-
-
-
-
-
-
-
-
- search |
- thesarus |
- browse
-
-
-
-
-
-};
-
my $l = $webpac->{'lookup'} || $log->logconfess("can't find lookup");
my @tree = ({
@@ -335,102 +294,13 @@
child_code => sub { 0 },
});
-my @show_ids;
-my @hide_ids;
-
-unroll(0,'');
-
-$log->debug("test filter: ",$tree[0]->{'filter_code'}->("root:99"));
-
-sub unroll {
- my ($level,$start_code) = @_;
-
- $log->logconfess("need level") unless (defined($level));
-
- # all levels passed?
- return if (! defined($tree[$level]));
-
- $log->debug("unroll level $level, start code $start_code");
-
- foreach my $code ($tree[$level]->{'code_arr'}->($start_code)) {
-
- if ($code = $tree[$level]->{'filter_code'}->($code)) {
-
- $log->debug("# $level filter passed code $code");
-
- my $v900 = $tree[$level]->{'lookup_v900'}->($code,$start_code) || $log->warn("can't lookup_v900($code,$start_code)");
- $log->debug("# $level lookup_v900($code,$start_code) = $v900");
-
- my $term = $tree[$level]->{'lookup_term'}->($code,$v900) || $log->warn("can't lookup_term($code,$v900)");
- $log->debug("# $level lookup_term($code,$v900) = $term");
-
- my $mfn = $tree[$level]->{'lookup_mfn'}->($code,$v900) || $log->warn("can't lookup_mfn($code,$v900)");
- $log->debug("# $level lookup_mfn($code,$v900) = $mfn");
-
- $log->debug("$code -> $v900 : $term [$mfn]");
-
- my ($link_start,$link_end) = ('','');
-
- my $have_children = $tree[$level]->{'have_children'}->($code,$v900,$start_code);
- if ($have_children) {
- ($link_start,$link_end) = (qq{},qq{});
- } else {
- $log->debug("# $level doesn't have_children($code,$v900,$start_code)");
- }
-
- my $mfn_link = "thes/$mfn.html";
- if (-e "out/$mfn_link") {
- print HTML " " x $level .
- qq{- ${link_start}${term}${link_end}}.
- qq{ »
\n};
- } else {
- $log->warn("file 'out/$mfn_link' doesn't exist, skipping");
- }
-
- unless ($have_children) {
- next;
- }
- my $style = $tree[$level]->{'style'};
-
- print HTML " " x $level .
- qq{\n \n};
-
- if ($style) {
- if ($style =~ m/display\s*:\s*none/i) {
- push @hide_ids, "id$mfn";
- } else {
- push @show_ids, "id$mfn";
- }
- } else {
- # default: show
- push @show_ids, "id$mfn";
- }
-
- unroll($level+1, $tree[$level]->{'child_code'}->($code,$v900,$start_code));
-
- print HTML " " x $level . qq{
\n};
-
- }
- }
-}
-
-print HTML qq{
-
-
-
-};
-
-close(HTML);
-
-
-my $js_file = "out/$js_url";
-$log->info("creating '$js_file' with arrays of shown and hidden ids");
-open(JS, ">", $js_file) || $log->logdie("can't open '$js_file': $!");
-print JS "var show = ['",join("','",@show_ids),"'];\n";
-print JS "var hide = ['",join("','",@hide_ids),"'];\n";
-close(JS);
+my $tree = new WebPAC::Tree(
+ dir => './out',
+ html => 'browse.html',
+ template => './output_template/tree.tt',
+ js => 'tree-ids.js',
+ tree => \@tree,
+);
$log->info("closing index");
$index->close;