fix CROASCII (B1.002:1982) filter
[webpac] / all2xml.pl
index 9ed7e4e..860560b 100755 (executable)
@@ -17,6 +17,7 @@ $|=1;
 
 my $config_file = $0;
 $config_file =~ s/\.pl$/.conf/;
+$config_file = $ARGV[0] if (-f $ARGV[0]);
 die "FATAL: can't find configuration file '$config_file'" if (! -e $config_file);
 
 my $config;
@@ -151,6 +152,56 @@ sub data2xml {
        }
 
 
+       # init variables for different types
+       sub init_visible_type($) {
+               my $type = shift;
+
+               # swish, swish_exact, display, index, index_lookup
+               # swish and display defaults
+               my ($s,$se,$d,$i,$il) = (1,0,1,0,0);
+               if (lc($type) eq "display") {
+                       $s = 0;
+               } elsif (lc($type) eq "swish") {
+                       $d = 0;
+               } elsif (lc($type) eq "index") {
+                       ($s,$se,$d,$i) = (0,1,0,1);
+               } elsif (lc($type) eq "swish_exact") {
+                       ($s,$se,$d,$i) = (0,1,0,0);
+               } elsif (lc($type) =~ /^lookup/) {
+                       ($s,$se,$d,$i,$il) = (0,1,0,0,1);
+               }
+               return ($s,$se,$d,$i,$il);
+       }
+
+
+       # convert
+       #
+       # <tag>
+       #  <delimiter>, </delimiter>
+       #  <value>200a</value>
+       # </tag>
+       # 
+       # to
+       #
+       # <tag delimiter=", ">200a</tag>
+       #
+       # but without loosing spaces in delimiter (becasue
+       # new XML::Simple strips spaces in attribute values
+       # as defined in XML specification)
+       #
+       sub unroll_x($) {
+               my $x = shift;
+
+               if (defined $x->{value}) {
+                       my ($v,$d) = ($x->{value}->{content}, $x->{delimiter}->{content});
+                       delete $x->{value};
+                       delete $x->{delimiter};
+                       $x->{content} = $v;
+                       $x->{delimiter} = $d;
+               }
+               return $x;
+       }
+
        # begin real work: go field by field
        foreach my $field (@sorted_tags) {
 
@@ -184,23 +235,18 @@ sub data2xml {
 
                foreach my $x (@{$config->{indexer}->{$field}->{$tag}}) {
 
+                       $x = unroll_x($x);
+
                        my $format = x($x->{content});
                        my $delimiter = x($x->{delimiter}) || ' ';
 
                        my $repeat_off = 0;     # init repeatable offset
 
-                       # swish, swish_exact, display, index, index_lookup
-                       # swish and display defaults
-                       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");
-                       ($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/);
+                       my ($s,$se,$d,$i,$il) = init_visible_type($x->{type});
 
                        # what will separate last line from this one?
                        if ($display_data && $x->{append}) {
-                               $line_delimiter = ' ';
+                               $line_delimiter = $delimiter;
                        } elsif ($display_data) {
                                $line_delimiter = '<br/>';
                        }
@@ -210,24 +256,10 @@ sub data2xml {
 
                        # placeholder for all repeatable entries for index
 
-                       sub chk_eval($) {
-                               my $data = shift;
-                               return if (! defined($data));
-                               if ($data && $data =~ s/\s*eval{([^}]+)}\s*//) {
-                                       if (eval "$1") {
-                                               return $data;
-                                       } else {
-                                               return undef;
-                                       }
-                               } else {
-                                       return $data;
-                               }
-                       }
-
                        sub mkformat($$) {
                                my $x = shift || die "mkformat needs tag reference";
                                my $data = shift || return;
-                               my $format_name = x($x->{format_name}) || return chk_eval($data);
+                               my $format_name = x($x->{format_name}) || return $data;
                                my $fmt = x($config->{format}->{$format_name}->{content}) || die "<format name=\"$format_name\"> is not defined!";
                                my $format_delimiter = x($x->{format_delimiter});
                                my @data;
@@ -240,10 +272,10 @@ sub data2xml {
                                if ($fmt) {
                                        my $nr = scalar $fmt =~ s/%s/%s/g;
                                        if (($#data+1) == $nr) {
-                                               return chk_eval(sprintf($fmt,@data));
+                                               return sprintf($fmt,@data);
                                        } else {
                                                #print STDERR "mkformat: [$data] can't be split on [$format_delimiter] to $nr fields!\n";
-                                               return chk_eval($data);
+                                               return $data;
                                        }
                                } else {
                                        print STDERR "usage of link '$format_name' without defined format (<link> tag)\n";
@@ -298,7 +330,6 @@ sub data2xml {
                                                $tmp = join(" ",&$filter($tmp)) if ($s || $se);
                                        }
 
-                                       $tmp = chk_eval($tmp);
                                        $swish_data .= $tmp if ($s && $tmp);
                                        $swish_exact_data .= "xxbxx $tmp xxexx " if ($tmp && $tmp ne "" && $se);
                                }
@@ -333,7 +364,6 @@ sub data2xml {
                                                no strict 'refs';
                                                $idisplay = &$filter($idisplay);
                                        }
-                                       $idisplay = chk_eval($idisplay);
                                        push @index_data, $idisplay if ($idisplay && !$iterate_by_page);
                                }
 
@@ -433,19 +463,17 @@ sub data2xml {
                # now try to parse variables from configuration file
                foreach my $x (@{$config->{indexer}->{$field}->{'config'}}) {
 
+                       $x = unroll_x($x);
+
                        my $delimiter = x($x->{delimiter}) || ' ';
                        my $val = $cfg->val($database, x($x->{content}));
 
-                       my ($s,$d,$i) = (1,1,0);        # swish, display default
-                       $s = 0 if (lc($x->{type}) eq "display");
-                       $d = 0 if (lc($x->{type}) eq "swish");
-                       # no support for swish exact in config.
-                       # IMHO, it's useless
-                       ($s,$d,$i) = (0,0,1) if (lc($x->{type}) eq "index");
+                       # FIXME index_lookup is not supported!
+                       my ($s,$se,$d,$i,$il) = init_visible_type($x->{type});
 
                        if ($val) {
                                $display_data .= $delimiter.$val if ($d);
-                               $swish_data .= $val if ($s);
+                               $swish_data .= " ".$val if ($s);
                                $index->insert($field, $val, $path) if ($i);
                        }
 
@@ -621,7 +649,7 @@ print STDERR "reading ./import_xml/$type.xml\n";
        my $type_base = $type;
        $type_base =~ s/_.+$//g;
 
-       $config=XMLin("./import_xml/$type.xml", forcearray => [ $type2tag{$type_base}, 'config', 'format' ], forcecontent => 1);
+       $config=XMLin("./import_xml/$type.xml", ForceArray => [ $type2tag{$type_base}, 'config', 'format' ], ForceContent => 1 );
 
        # output current progress indicator
        my $last_p = 0;
@@ -891,6 +919,10 @@ __END__
 
 all2xml.pl - read various file formats and dump XML for SWISH-E
 
+=head1 SYNOPSYS
+
+ $ all2xml.pl [test.conf]
+
 =head1 DESCRIPTION
 
 This command will read ISIS data file using OpenIsis perl module, MARC
@@ -899,6 +931,9 @@ create one XML file for usage with I<SWISH-E> indexer. Dispite it's name,
 this script B<isn't general xml generator> from isis files (isis allready
 has something like that). Output of this script is tailor-made for SWISH-E.
 
+If no configuration file is specified, it will use default one called
+C<all2xml.conf>.
+
 =head1 BUGS
 
 Documentation is really lacking. However, in true Open Source spirit, source