[libcatmandu-marc-perl] 150/208: Merge branch 'dev' into dev

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag upstream/1.19
in repository libcatmandu-marc-perl.

commit 1c90067f19ed20fc19c021973e3dd08b3beef9cf
Merge: e3fe3ff 9438625
Author: Patrick Hochstenbach <patrick.hochstenbach at ugent.be>
Date:   Thu Jun 15 09:03:25 2017 +0200

    Merge branch 'dev' into dev

 Changes              |   6 +++
 lib/Catmandu/MARC.pm | 124 ++++++++++++++++++++++++++-------------------------
 2 files changed, 69 insertions(+), 61 deletions(-)

diff --cc Changes
index 2e172de,d14bada..ca7f923
--- a/Changes
+++ b/Changes
@@@ -1,12 -1,13 +1,18 @@@
  Revision history for Catmandu-MARC
  
  {{$NEXT}}
+   - Fixing join subfields per field correctly in marc_spec
+ 
+ 1.12  2017-05-29 10:23:23 CEST
+   - Fixing missing space to caret translation in 008 fields for ALEPHSEQ exports
+   - Upgrading to latest MARC::File::XML
+   - Providing documenation on the MARC-in-JSON format
  
 +1.12  2017-05-29 10:23:23 CEST
 +  - Fixing missing space to caret translation in 008 fields for ALEPHSEQ exports
 +  - Upgrading to latest MARC::File::XML
 +  - Providing documenation on the MARC-in-JSON format
 +
  1.11  2017-05-15 09:11:38 CEST
    - Upgrading to MARC::Spec 1.0.0
    - Fixing MARCspec Parser exception
diff --cc lib/Catmandu/MARC.pm
index f32c773,e6ab9c7..07d0d49
--- a/lib/Catmandu/MARC.pm
+++ b/lib/Catmandu/MARC.pm
@@@ -687,18 -690,18 +689,18 @@@ sub _validate_subspec 
  
      if($subspec->operator eq '~') {
          foreach my $v ( @{$left_subterm->[0]} ) {
-             return 1 if List::Util::any {$v =~ /$_/} @{$right_subterm}
 -            return 1 if List::Util::any {$v =~ m?$_?} @{$right_subterm};
++            return 1 if List::Util::any {$v =~ /$_/} @{$right_subterm};
          }
      }
  
      if($subspec->operator eq '!~') {
          foreach my $v ( @{$left_subterm->[0]} ) {
-             return 0 if List::Util::any {$v =~ /$_/} @{$right_subterm}
 -            return 0 if List::Util::any {$v =~ m?$_?} @{$right_subterm};
++            return 0 if List::Util::any {$v =~ /$_/} @{$right_subterm};
          }
-         return 1
+         return 1;
      }
  
-     return 0
+     return 0;
  }
  
  sub parse_marc_spec {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcatmandu-marc-perl.git