--- trunk/all2xml.pl 2003/11/24 21:54:19 178
+++ trunk/all2xml.pl 2003/12/15 00:12:16 196
@@ -72,6 +72,8 @@
# if you are tight on memory, turn this off
my $use_lhash_cache = 1;
+my $last_field_name; # cache to prevent repeated fields
+
sub data2xml {
use xmlify;
@@ -102,20 +104,22 @@
}
my @sorted_tags;
- if ($cache->{tags_by_order}->{$type}) {
- @sorted_tags = @{$cache->{tags_by_order}->{$type}};
+ if ($cache->{tags_by_order}) {
+ @sorted_tags = @{$cache->{tags_by_order}};
} else {
@sorted_tags = sort by_order keys %{$config->{indexer}};
- $cache->{tags_by_order}->{$type} = \@sorted_tags;
+ $cache->{tags_by_order} = \@sorted_tags;
}
# lookup key
my $lookup_key;
# cache for field in pages
- $cache->{display_data} = ();
- $cache->{swish_data} = ();
- $cache->{swish_exact_data} = ();
+ delete $cache->{display_data};
+ delete $cache->{swish_data};
+ delete $cache->{swish_exact_data};
+ delete $cache->{index_data};
+ delete $cache->{index_delimiter};
my @page_fields; # names of fields
@@ -136,7 +140,13 @@
print STDERR "WARNING: field '$field' doesn't have 'name' attribute!";
}
if ($field_name) {
- return x($field_name);
+ if (! $last_field_name) {
+ $last_field_name = x($field_name);
+ return $last_field_name;
+ } elsif ($field_name ne $last_field_name) {
+ $last_field_name = x($field_name);
+ return $last_field_name;
+ }
}
}
@@ -150,6 +160,7 @@
my $swish_data = "";
my $swish_exact_data = "";
my $display_data = "";
+ my @index_data;
my $line_delimiter;
my ($swish,$display);
@@ -162,6 +173,14 @@
my %page_max = ();
# default line_delimiter if using
my $page_line_delimiter = $config->{indexer}->{$field}->{page_line_delimiter} || '
';
+ $cache->{index_delimiter}->{$field} = $config->{indexer}->{$field}->{index_delimiter};
+
+ my $format_name = $config->{indexer}->{$field}->{format_name};
+ my $format_delimiter = $config->{indexer}->{$field}->{format_delimiter};
+ if ($format_name && $format_delimiter) {
+ $cache->{format}->{$field}->{format_name} = $format_name;
+ $cache->{format}->{$field}->{format_delimiter} = $format_delimiter;
+ }
foreach my $x (@{$config->{indexer}->{$field}->{$tag}}) {
@@ -175,13 +194,12 @@
my ($s,$se,$d,$i,$il) = (1,0,1,0,0);
$s = 0 if (lc($x->{type}) eq "display");
$d = 0 if (lc($x->{type}) eq "swish");
- $se = 1 if (lc($x->{type}) eq "swish_exact");
- ($s,$d,$i) = (0,0,1) if (lc($x->{type}) eq "index");
- $il = 1 if (lc($x->{type}) =~ /^lookup/);
-
+ ($s,$se,$d,$i) = (0,1,0,1) if (lc($x->{type}) eq "index");
+ ($s,$se,$d,$i) = (0,1,0,0) if (lc($x->{type}) eq "swish_exact");
+ ($s,$se,$d,$i,$il) = (0,1,0,0,1) if (lc($x->{type}) =~ /^lookup/);
# what will separate last line from this one?
- if ($display_data && $x->{append} && $x->{append} eq "1") {
+ if ($display_data && $x->{append}) {
$line_delimiter = ' ';
} elsif ($display_data) {
$line_delimiter = '
';
@@ -191,9 +209,8 @@
($swish,$display) = (1,1);
# placeholder for all repeatable entries for index
- my @index_data;
- sub mkformat {
+ sub mkformat($$) {
my $x = shift || die "mkformat needs tag reference";
my $data = shift || return;
my $format_name = x($x->{format_name}) || return $data;
@@ -265,11 +282,23 @@
no strict 'refs';
my $tmp = join(" ",&$filter($swish)) if ($s || $se);
$swish_data .= $tmp if ($s);
- $swish_exact_data .= $tmp if ($se);
+ if ($se) {
+ if ($swish_exact_data) {
+ $swish_exact_data .= "xxexx xxbxx ".$tmp;
+ } else {
+ $swish_exact_data .= $tmp;
+ }
+ }
} else {
$swish_data .= $swish if ($s);
- $swish_exact_data .= $swish if ($se);
+ if ($se) {
+ if ($swish_exact_data) {
+ $swish_exact_data .= "xxexx xxbxx ".$swish;
+ } else {
+ $swish_exact_data .= $swish;
+ }
+ }
}
}
@@ -295,16 +324,14 @@
}
# type="index" ; insert into index
+ my $idisplay;
if ($i && $display) {
+ $idisplay = $display;
if ($filter) {
no strict 'refs';
- $display = &$filter($display);
- }
- if ($x->{append} && @index_data) {
- $index_data[$#index_data].=$display;
- } else {
- push @index_data, $display;
+ $idisplay = &$filter($idisplay);
}
+ push @index_data, $idisplay if (! $iterate_by_page);
}
# store fields in lookup
@@ -330,17 +357,18 @@
sub iterate_fld($$$$$$) {
my ($cache,$what,$field,$page,$data,$append) = @_;
return if (!$data);
- my $line_delimiter = $page_line_delimiter;
- $line_delimiter = " " if ($append);
+
+ my $ldel = $page_line_delimiter;
+ $ldel = " " if ($append);
+#print STDERR "line delimiter: ",Dumper($ldel) if ($ldel);
if (! $cache->{$what}->{$field}->[$page]) {
$cache->{$what}->{$field}->[$page] = $data;
} else {
- $cache->{$what}->{$field}->[$page] .= $line_delimiter.$data;
+ $cache->{$what}->{$field}->[$page] .= $ldel.$data;
}
}
if ($display_data) {
-print STDERR "line delimiter: ",Dumper($line_delimiter) if ($line_delimiter);
iterate_fld($cache,'display_data',$field,$page,$display_data,$x->{append});
}
$display_data = "";
@@ -352,12 +380,40 @@
iterate_fld($cache,'swish_exact_data',$field,$page,$swish_exact_data,$x->{append});
$swish_exact_data = "";
}
+
+ if ($idisplay) {
+ my $ldel=$page_line_delimiter;
+ my @index_data;
+ if ($cache->{index_data}->{$field}->[$page]) {
+
+ @index_data = @{$cache->{index_data}->{$field}->[$page]};
+ }
+ if ($x->{append}) {
+ if (@index_data) {
+ $index_data[$#index_data] .= $idisplay;
+ } else {
+ push @index_data, $idisplay;
+ }
+ } else {
+ push @index_data, $idisplay;
+ }
+ $idisplay = "";
+ @{$cache->{index_data}->{$field}->[$page]} = @index_data;
+ }
}
}
- # fill data in index
- foreach my $d (@index_data) {
- $index->insert($field, $d, $path);
+ if (! $iterate_by_page) {
+ my $idel = $x->{index_delimiter};
+ # fill data in index
+ foreach my $tmp (@index_data) {
+ my $i = $d = $tmp;
+ if ($idel && $tmp =~ m/$idel/) {
+ ($i,$d) = split(/$idel/,$tmp);
+ }
+ $index->insert($field, $i, $d, $path);
+ }
+ @index_data = ();
}
}
@@ -405,8 +461,12 @@
#print STDERR "field '$field' iterate over ",($nr_pages || 0)," pages...\n";
#print STDERR Dumper($cache->{display_data});
for (my $page=0; $page <= $nr_pages; $page++) {
-
- my $display_data = $cache->{display_data}->{$field}->[$page];
+ my $display_data;
+ if ($cache->{format}->{$field}) {
+ $display_data=mkformat($cache->{format}->{$field},$cache->{display_data}->{$field}->[$page]);
+ } else {
+ $display_data = $cache->{display_data}->{$field}->[$page];
+ }
if ($display_data) { # default
if ($field eq "headline") {
$xml .= xmlify("headline", $display_data);
@@ -436,6 +496,17 @@
# That is required to produce exact match
$xml .= xmlify($field."_swish_exact", unac_string($codepage,'xxbxx '.$swish_exact_data.' xxexx'));
}
+
+ my $idel = $cache->{index_delimiter}->{$field};
+ foreach my $tmp (@{$cache->{index_data}->{$field}->[$page]}) {
+ my $i = $tmp;
+ my $d = $tmp;
+ if ($idel && $tmp =~ m/$idel/) {
+ ($i,$d) = split(/$idel/,$tmp);
+ }
+ $index->insert($field, $i, $d, $path);
+#print STDERR "index [$idel] $field: $i --> $d [$path]\n";
+ }
}
}
@@ -566,6 +637,9 @@
# now read database
print STDERR "using: $type...\n";
+ # erase cache for tags by order in this database
+ delete $cache->{tags_by_order};
+
if ($type_base eq "isis") {
my $isis_db = $cfg -> val($database, 'isis_db') || die "$database doesn't have 'isis_db' defined!";