--- trunk2/all2all.pl 2004/09/14 09:23:00 440
+++ trunk2/all2all.pl 2004/09/23 23:17:42 466
@@ -7,7 +7,7 @@
=cut
use strict;
-use Data::Dumper;
+use YAML;
use Carp;
use Getopt::Long;
@@ -15,6 +15,7 @@
use WebPAC;
use WebPAC::jsFind;
use WebPAC::Index;
+use WebPAC::Tree;
# options which can be changed via command line
#
@@ -65,6 +66,7 @@
# tree structure
{ 'eval' => 'length("v251") == 2', 'key' => 'root:v251', 'val' => 'v900' },
{ 'eval' => '"v251"', 'key' => 'code:v900', 'val' => 'v561^4:v251' },
+ { 'eval' => '"v561^4" && "v562^4"', 'key' => 'code:v900', 'val' => 'v561^4:v562^4' },
],
);
@@ -81,8 +83,8 @@
my @ds = $webpac->data_structure($rec);
if (0 && $log->is_debug) {
- $log->debug("rec = ",Dumper($rec));
- $log->debug("ds = ",Dumper(\@ds));
+ $log->debug("rec = ",Dump($rec));
+ $log->debug("ds = ",Dump(\@ds));
}
next if (! @ds);
@@ -113,11 +115,19 @@
foreach my $ds (@ds) {
next if (! $ds->{'swish'});
+ # strip all non word characters from beginning or end
+ # of word
+ my $words = join(" ",@{$ds->{'swish'}});
+ $words =~ s/^\W+//;
+ $words =~ s/\W*\s+\W*/ /g;
+ $words =~ s/\W+$//;
+
$index->insert(
index_name => $ds->{'tag'},
- path => $f,
+ #path => $f,
+ path => $webpac->mfn,
headline => $headline,
- words => join(" ",@{$ds->{'swish'}})
+ words => $words,
);
}
@@ -129,13 +139,13 @@
foreach my $h (@{$ds->{'index'}}) {
$thes->{$ds->{'tag'}}->insert(
- path => $f,
headline => $h,
+ mfn => $webpac->mfn,
);
}
}
-# print Dumper(\@ds);
+# print Dump(\@ds);
}
@@ -159,65 +169,23 @@
}
if (0 && $log->is_debug) {
- $log->debug("lookup hash: ",Dumper($webpac->{'lookup'}));
- $log->debug("data hash: ",Dumper($webpac->{'data'}));
+ $log->debug("lookup hash: ",Dump($webpac->{'lookup'}));
+ $log->debug("data hash: ",Dump($webpac->{'data'}));
foreach my $t (keys %{$thes}) {
- $log->debug("thesaurus $t hash: ",Dumper($thes->{$t}));
+ $log->debug("thesaurus $t hash: ",Dump($thes->{$t}));
}
}
} # XXX if(0)
-$log->debug("lookup hash: ",Dumper($webpac->{'lookup'}));
+$log->debug("lookup hash: ",Dump($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 = ({
@@ -230,207 +198,99 @@
lookup_v900 => sub { shift @{$l->{"root:".$_[0]}} },
lookup_term => sub { shift @{$l->{"d:".$_[1]}} },
lookup_mfn => sub { shift @{$l->{"900_mfn:".$_[1]}} },
- have_children => sub { defined($l->{"a:".$_[0]."::"}) },
- child_code => sub { return $_[0] },
+ have_children => sub { return $l->{"a:".$_[0]."::"} },
+ have_children_at_level => sub {
+ my $l2 = shift;
+ my $l1 = substr($l2,0,1);
+ return(9, "a:$l1:$l2:" ) if ($l->{"a:$l1:$l2"});
+ },
style => 'display: none',
},{
# 1
- code_arr => sub { @{$l->{"a:".$_[0]."::"}} },
+ code_arr => sub { @{$_[0]} },
filter_code => sub { shift }, # nop
lookup_v900 => sub { shift @{$l->{"code:".$_[0]}} },
lookup_term => sub { shift @{$l->{"d:".$_[0]}} },
lookup_mfn => sub { shift @{$l->{"900_mfn:".$_[0]}} },
- have_children => sub { defined($l->{"a:".$_[1].":"}) },
- child_code => sub { return $_[1] },
+ have_children => sub { return $l->{"a:".$_[1].":"} },
style => 'display: none',
},{
# 2
- code_arr => sub { @{$l->{"a:".$_[0].":"}} },
+ code_arr => sub { @{$_[0]} },
filter_code => sub { shift },
- lookup_v900 => sub { shift },
+ lookup_v900 => sub { shift @{$l->{"code:".$_[0]}} },
lookup_term => sub { shift @{$l->{"d:".$_[0]}} },
lookup_mfn => sub { shift @{$l->{"900_mfn:".$_[0]}} },
- have_children => sub { defined($l->{"a:".$_[2].":".$_[1]}) },
- child_code => sub { return "a:".$_[2].":".$_[1] },
- style => 'display: none',
+ have_children => sub { return $l->{"a:".$_[1].":".$_[0]} },
+ #style => 'display: none',
},{
# 3 uži pojam
- code_arr => sub { @{$l->{$_[0]}} },
+ code_arr => sub { @{$_[0]} },
filter_code => sub { shift },
- lookup_v900 => sub {
- my ($c,$p) = @_;
- $p =~ s/^a:(..:....):.*$/$1/;
- return "a:".$p.":".$c;
- },
+ lookup_v900 => sub { shift @{$l->{"code:".$_[0]}} },
lookup_term => sub { shift @{$l->{"d:".$_[0]}} },
lookup_mfn => sub { shift @{$l->{"900_mfn:".$_[0]}} },
- have_children => sub { defined($l->{$_[1]}) },
- child_code => sub { return $_[1] },
+ have_children => sub { return $l->{"a:".$_[1].":".$_[0]} },
},{
# 4
- code_arr => sub { @{$l->{$_[0]}} },
+ code_arr => sub { @{$_[0]} },
filter_code => sub { shift },
- lookup_v900 => sub {
- my ($c,$p) = @_;
- $p =~ s/^a:(..:....):.*$/$1/;
- return "a:".$p.":".$c;
- },
+ lookup_v900 => sub { shift @{$l->{"code:".$_[0]}} },
lookup_term => sub { shift @{$l->{"d:".$_[0]}} },
lookup_mfn => sub { shift @{$l->{"900_mfn:".$_[0]}} },
- have_children => sub { defined($l->{$_[1]}) },
- child_code => sub { return $_[1] },
+ have_children => sub { return $l->{"a:".$_[1].":".$_[0]} },
},{
# 5
- code_arr => sub { @{$l->{$_[0]}} },
+ code_arr => sub { @{$_[0]} },
filter_code => sub { shift },
- lookup_v900 => sub {
- my ($c,$p) = @_;
- $p =~ s/^a:(..:....):.*$/$1/;
- return "a:".$p.":".$c;
- },
+ lookup_v900 => sub { shift @{$l->{"code:".$_[0]}} },
lookup_term => sub { shift @{$l->{"d:".$_[0]}} },
lookup_mfn => sub { shift @{$l->{"900_mfn:".$_[0]}} },
- have_children => sub { defined($l->{$_[1]}) },
- child_code => sub { return $_[1] },
+ have_children => sub { return $l->{"a:".$_[1].":".$_[0]} },
},{
# 6
- code_arr => sub { @{$l->{$_[0]}} },
+ code_arr => sub { @{$_[0]} },
filter_code => sub { shift },
- lookup_v900 => sub {
- my ($c,$p) = @_;
- $p =~ s/^a:(..:....):.*$/$1/;
- return "a:".$p.":".$c;
- },
+ lookup_v900 => sub { shift @{$l->{"code:".$_[0]}} },
lookup_term => sub { shift @{$l->{"d:".$_[0]}} },
lookup_mfn => sub { shift @{$l->{"900_mfn:".$_[0]}} },
- have_children => sub { defined($l->{$_[1]}) },
- child_code => sub { return $_[1] },
+ have_children => sub { return $l->{"a:".$_[1].":".$_[0]} },
},{
# 7
- code_arr => sub { @{$l->{$_[0]}} },
+ code_arr => sub { @{$_[0]} },
filter_code => sub { shift },
- lookup_v900 => sub {
- my ($c,$p) = @_;
- $p =~ s/^a:(..:....):.*$/$1/;
- return "a:".$p.":".$c;
- },
+ lookup_v900 => sub { shift @{$l->{"code:".$_[0]}} },
lookup_term => sub { shift @{$l->{"d:".$_[0]}} },
lookup_mfn => sub { shift @{$l->{"900_mfn:".$_[0]}} },
- have_children => sub { defined($l->{$_[1]}) },
- child_code => sub { return $_[1] },
+ have_children => sub { return $l->{"a:".$_[1].":".$_[0]} },
},{
# 8
+ code_arr => sub { @{$_[0]} },
+ filter_code => sub { shift },
+ lookup_v900 => sub { shift @{$l->{"code:".$_[0]}} },
+ lookup_term => sub { shift @{$l->{"d:".$_[0]}} },
+ lookup_mfn => sub { shift @{$l->{"900_mfn:".$_[0]}} },
+# have_children => sub { return $l->{"a:".$_[1].":".$_[0]} },
+ have_children => sub { 0 },
+ },{
+ # 9 - level which is never reached except explicitly
code_arr => sub { @{$l->{$_[0]}} },
filter_code => sub { shift },
- lookup_v900 => sub {
- my ($c,$p) = @_;
- $p =~ s/^a:(..:....):.*$/$1/;
- return "a:".$p.":".$c;
- },
+ lookup_v900 => sub { shift @{$l->{"code:".$_[0]}} },
lookup_term => sub { shift @{$l->{"d:".$_[0]}} },
lookup_mfn => sub { shift @{$l->{"900_mfn:".$_[0]}} },
-# have_children => sub { defined($l->{$_[1]}) },
-# child_code => sub { return $_[1] },
have_children => sub { 0 },
- child_code => sub { 0 },
+ have_children_at_level => sub { defined($l->{"a:".$_[1].":".$_[0]}) && return (9,"a:".$_[1].":".$_[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;