filter fix && optimisation

git-svn-id: file:///home/dpavlin/private/svn/webpac/trunk@42 13eb9ef6-21d5-0310-b721-a9d68796d827

diff --git a/all2xml.pl b/all2xml.pl
index d3b88f6..ab0474a 100755 (executable)
--- a/all2xml.pl
+++ b/all2xml.pl
@@ -124,6 +124,7 @@ sub isis2xml {
                                        if ($filter) {
                                                no strict 'refs';
                                                $swish_data .= join(" ",&$filter($swish));
+print STDERR "#### $swish_data\n";
                                        } else {
                                                $swish_data .= $swish;
                                        }

diff --git a/filter/isn_swish.pm b/filter/isn_swish.pm
index b174fb9..e82e6e7 100755 (executable)
--- a/filter/isn_swish.pm
+++ b/filter/isn_swish.pm
@@ -6,9 +6,8 @@ sub isn_swish {
        my @out;
        foreach my $nr1 (@_) {
                push @out,$nr1; # save original
-               my $nr2 = $nr1;
-               $nr2 =~ s/\-//g;
-               push @out,$nr2; # save version without hyphens
+               $nr1 =~ s/\-//g;
+               push @out,$nr1; # save version without hyphens
        }
        return @out;
 }

diff --git a/filter/lang_swish.pm b/filter/lang_swish.pm
index 27979e9..45118fc 100755 (executable)
--- a/filter/lang_swish.pm
+++ b/filter/lang_swish.pm
@@ -4,9 +4,10 @@ sub lang_swish {
        my @out;
        foreach my $v1 (@_) {
                push @out,$v1;  # save original
-               my $v2 = $v1;
-               $v2 =~ s/HRV/Hrvatski/gi;
-               push @out,$v2;  # save modified version
+               $v1 =~ s/(HRV|CRO)/Hrvatski/gi;
+               $v1 =~ s/GER/Njemaèki/gi;
+               $v1 =~ s/ENG/Engleski/gi;
+               push @out,$v1;  # save modified version
        }
        return @out;
 }