--- trunk/all2xml.pl 2003/02/23 07:08:54 29
+++ trunk/all2xml.pl 2003/02/23 08:06:07 34
@@ -63,8 +63,16 @@
my %field_usage; # counter for usage of each field
+ # sort subrouting using order="" attribute
+ sub by_order {
+ return 0 if (! $config->{indexer}->{$a}->{order});
+ return 0 if (! $config->{indexer}->{$b}->{order});
+
+ return $config->{indexer}->{$a}->{order} <=>
+ $config->{indexer}->{$b}->{order} ;
+ }
- foreach my $field (keys %{$config->{indexer}}) {
+ foreach my $field (sort by_order keys %{$config->{indexer}}) {
$field_usage{$field}++;
@@ -72,6 +80,8 @@
my $display_data = "";
my $line_delimiter = "";
+ my ($swish,$display);
+
foreach my $x (@{$config->{indexer}->{$field}->{isis}}) {
my $format = $x->{content};
@@ -93,9 +103,15 @@
($s,$d,$i) = (0,0,1) if (lc($x->{type}) eq "index");
#print STDERR "## s: $s d: $d i: $i ## $format ##\n";
- $display_data .= $line_delimiter if ($display_data && $display_data !~ /$line_delimiter$/);
+ if ($x->{append}) {
+ $line_delimiter = ' ';
+ } else {
+ $line_delimiter = '
';
+ }
- my ($swish,$display) = (1,1);
+ $display_data .= $line_delimiter if ($display_data && $display);
+ # init vars so that we go into while...
+ ($swish,$display) = (1,1);
while ($swish || $display) {
($swish,$display) = parse_format($format,$row,$isis_i++);
@@ -112,7 +128,7 @@
# type="swish" ; field for swish
if ($s && $swish) {
if ($filter) {
-print STDERR "using filter '$filter'\n";
+#print STDERR "using filter '$filter'\n";
no strict 'refs';
$swish_data .= join(" ",&$filter($swish));
} else {
@@ -147,11 +163,6 @@
}
}
}
- if ($x->{append}) {
- $line_delimiter = ' ';
- } else {
- $line_delimiter = '
';
- }
}