ported 257:258 from hidra branch

all2xml.pl - fix for swish without filter
openisis/perl/OpenIsis.pm - removed warning

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

diff --git a/all2xml.pl b/all2xml.pl
index d6f704a..9ed7e4e 100755 (executable)
--- a/all2xml.pl
+++ b/all2xml.pl
@@ -292,10 +292,10 @@ sub data2xml {
                                }
                                # type="swish" ; field for swish
                                if ($swish) {
-                                       my $tmp;
+                                       my $tmp = $swish;
                                        if ($filter && ($s || $se)) {
                                                no strict 'refs';
-                                               $tmp = join(" ",&$filter($swish)) if ($s || $se);
+                                               $tmp = join(" ",&$filter($tmp)) if ($s || $se);
                                        }
 
                                        $tmp = chk_eval($tmp);

diff --git a/openisis/perl/OpenIsis.pm b/openisis/perl/OpenIsis.pm
index f5053bd..057cd00 100644 (file)
--- a/openisis/perl/OpenIsis.pm
+++ b/openisis/perl/OpenIsis.pm
@@ -81,7 +81,7 @@ bootstrap OpenIsis $VERSION;
 
 sub MHL {
        for ( @_ ) {
-               s/(<[^=>]*)=[^>]+>/\1>/g; # dump <a=b> substitutions
+               s/(<[^=>]*)=[^>]+>/$1>/g; # dump <a=b> substitutions
                s/></; /g; # replace >< pairs
                s/[><]//g; # nuke other ><
                s/^\^.//; # kill initial subfield spec